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

gnu: e2fsprogs: Use 'modify-phases' syntax. 

* gnu/packages/linux.scm (e2fsprogs)[arguments]<#:phases>: Use 'modify-phases'.
This commit is contained in:
Marius Bakke 2017-05-10 15:47:29 +02:00
parent 62ec02bf21
commit 55acb372e3
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/linux.scm
View File

@ -695,8 +695,9 @@ slabtop, and skill.")
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/lib")) "/lib"))
#:phases (alist-cons-before #:phases
'configure 'patch-shells (modify-phases %standard-phases
(add-before 'configure 'patch-shells
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("/bin/sh (.*)parse-types.sh" _ dir) (("/bin/sh (.*)parse-types.sh" _ dir)
@ -704,9 +705,9 @@ slabtop, and skill.")
"parse-types.sh"))) "parse-types.sh")))
(substitute* (find-files "." "^Makefile.in$") (substitute* (find-files "." "^Makefile.in$")
(("#!/bin/sh") (("#!/bin/sh")
(string-append "#!" (which "sh"))))) (string-append "#!" (which "sh"))))
(alist-cons-after #t))
'install 'install-libs (add-after 'install 'install-libs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))) (lib (string-append out "/lib")))
@ -721,8 +722,7 @@ slabtop, and skill.")
(for-each (lambda (file) (for-each (lambda (file)
(chmod file #o666)) (chmod file #o666))
archives) archives)
#t)))) #t))))))
%standard-phases))
;; FIXME: Tests work by comparing the stdout/stderr of programs, that ;; FIXME: Tests work by comparing the stdout/stderr of programs, that
;; they fail because we get an extra line that says "Can't check if ;; they fail because we get an extra line that says "Can't check if