diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-02-20 04:16:00 +0100 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2018-02-20 16:06:09 +0100 |
| commit | c04e5116934122bb1ad8853d252081b38d0f5476 (patch) | |
| tree | 9985ed8ca82a401d93cee5e8f5059600eeb1c8b8 | |
| parent | 20897536e5a9b11696f8343c804232c52677d4ed (diff) | |
| download | patches-c04e5116934122bb1ad8853d252081b38d0f5476.tar patches-c04e5116934122bb1ad8853d252081b38d0f5476.tar.gz | |
gnu: glibc-hurd-headers: Update phase style.
* gnu/packages/base.scm (glibc/hurd-headers)[arguments]: Use
MODIFY-PHASES syntax and INVOKE, and end phases with #t.
| -rw-r--r-- | gnu/packages/base.scm | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1ea095abf9..7607755593 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1052,30 +1053,25 @@ command.") "--host=i586-pc-gnu" "--enable-obsolete-rpc")) ((#:phases _) - '(alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (and (zero? (system* "make" "install-headers")) - - ;; Make an empty stubs.h to work around not being able to - ;; produce a valid stubs.h and causing the build to fail. See - ;; <http://lists.gnu.org/archive/html/guix-devel/2014-04/msg00233.html>. - (let ((out (assoc-ref outputs "out"))) - (close-port - (open-output-file - (string-append out "/include/gnu/stubs.h")))))) - - ;; Nothing to build. - (alist-delete - 'build - - (alist-cons-before - 'configure 'pre-configure - (lambda _ - ;; Use the right 'pwd'. - (substitute* "configure" - (("/bin/pwd") "pwd"))) - %standard-phases)))))))) + '(modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" "install-headers") + + ;; Make an empty stubs.h to work around not being able to + ;; produce a valid stubs.h and causing the build to fail. See + ;; <http://lists.gnu.org/archive/html/guix-devel/2014-04/msg00233.html>. + (let ((out (assoc-ref outputs "out"))) + (close-port + (open-output-file + (string-append out "/include/gnu/stubs.h")))))) + (delete 'build) ; nothing to build + (add-before 'configure 'patch-configure-script + (lambda _ + ;; Use the right 'pwd'. + (substitute* "configure" + (("/bin/pwd") "pwd")) + #t)))))))) (define-public tzdata (package |