nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: util-linux: Use 'modify-phases'. 

* gnu/packages/linux.scm (util-linux)[arguments]: Use 'modify-phases' instead
  of 'alist-cons-before'.
This commit is contained in:
Ludovic Courtès 2015-07-14 12:39:58 +02:00
parent 7a34576206
commit 1b9cf4ad2f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/linux.scm
View File

@ -417,17 +417,17 @@ providing the system administrator with some help in common tasks.")
(string-append "--with-bashcompletiondir=" (string-append "--with-bashcompletiondir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/bash_completion.d")) "/etc/bash_completion.d"))
#:phases (alist-cons-before #:phases (modify-phases %standard-phases
'check 'pre-check (add-before
(lambda* (#:key inputs outputs #:allow-other-keys) 'check 'pre-check
(let ((out (assoc-ref outputs "out")) (lambda* (#:key inputs outputs #:allow-other-keys)
(net (assoc-ref inputs "net-base"))) (let ((out (assoc-ref outputs "out"))
;; Change the test to refer to the right file. (net (assoc-ref inputs "net-base")))
(substitute* "tests/ts/misc/mcookie" ;; Change the test to refer to the right file.
(("/etc/services") (substitute* "tests/ts/misc/mcookie"
(string-append net "/etc/services"))) (("/etc/services")
#t)) (string-append net "/etc/services")))
%standard-phases))) #t))))))
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("ncurses" ,ncurses))) ("ncurses" ,ncurses)))
(native-inputs (native-inputs