me/guix
Archived
1
0
Fork 0
Code Activity

gnu: glibc-hurd-headers: Update phase style.

Browse source 
* gnu/packages/base.scm (glibc/hurd-headers)[arguments]: Use
MODIFY-PHASES syntax and INVOKE, and end phases with #t.
This commit is contained in:
Tobias Geerinckx-Rice 2018-02-20 04:16:00 +01:00
parent 20897536e5
commit c04e511693
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/base.scm
View file

@ -12,6 +12,7 @@
;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -1052,10 +1053,10 @@ command.")
"--host=i586-pc-gnu" "--host=i586-pc-gnu"
"--enable-obsolete-rpc")) "--enable-obsolete-rpc"))
((#:phases _) ((#:phases _)
'(alist-replace '(modify-phases %standard-phases
'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(and (zero? (system* "make" "install-headers")) (invoke "make" "install-headers")
;; Make an empty stubs.h to work around not being able to ;; Make an empty stubs.h to work around not being able to
;; produce a valid stubs.h and causing the build to fail. See ;; produce a valid stubs.h and causing the build to fail. See
@ -1064,18 +1065,13 @@ command.")
(close-port (close-port
(open-output-file (open-output-file
(string-append out "/include/gnu/stubs.h")))))) (string-append out "/include/gnu/stubs.h"))))))
(delete 'build) ; nothing to build
;; Nothing to build. (add-before 'configure 'patch-configure-script
(alist-delete
'build
(alist-cons-before
'configure 'pre-configure
(lambda _ (lambda _
;; Use the right 'pwd'. ;; Use the right 'pwd'.
(substitute* "configure" (substitute* "configure"
(("/bin/pwd") "pwd"))) (("/bin/pwd") "pwd"))
%standard-phases)))))))) #t))))))))
(define-public tzdata (define-public tzdata
(package (package