mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: cook: Update phase style.
* gnu/packages/cook.scm (cook)[arguments]: Use MODIFY-PHASES syntax and end phase with #t.
This commit is contained in:
parent
61faf24df6
commit
ea5d238dae
1 changed files with 19 additions and 18 deletions
|
@ -1,5 +1,6 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
|
||||||
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -41,26 +42,26 @@ (define-public cook
|
||||||
(arguments
|
(arguments
|
||||||
`(#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
|
`(#:parallel-build? #f ; There are some nasty racy rules in the Makefile.
|
||||||
#:phases
|
#:phases
|
||||||
(alist-cons-before
|
(modify-phases %standard-phases
|
||||||
'configure 'pre-conf
|
(add-before 'configure 'pre-conf
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* (append '("common/env.c")
|
(substitute* (append '("common/env.c")
|
||||||
(find-files "test" "\\.sh"))
|
(find-files "test" "\\.sh"))
|
||||||
(("/bin/sh") (which "sh")))
|
(("/bin/sh") (which "sh")))
|
||||||
|
|
||||||
;; Guix's binutils (because it wants bit-reproducable builds) is
|
;; Guix's binutils (because it wants bit-reproducable builds) is
|
||||||
;; is configured with the --enable-deterministic-archives flag.
|
;; is configured with the --enable-deterministic-archives flag.
|
||||||
;; This means the timestamp of files appended to an ar archive
|
;; This means the timestamp of files appended to an ar archive
|
||||||
;; are automatically and silently mutated to 00:00 1 Jan 1970
|
;; are automatically and silently mutated to 00:00 1 Jan 1970
|
||||||
;; which plays havoc with this test, for which correct timestamps
|
;; which plays havoc with this test, for which correct timestamps
|
||||||
;; are very important. Adding the U flag undoes the effect of
|
;; are very important. Adding the U flag undoes the effect of
|
||||||
;; --enable-deterministic-archives and allows this test to work
|
;; --enable-deterministic-archives and allows this test to work
|
||||||
;; again.
|
;; again.
|
||||||
(substitute* "test/00/t0077a.sh"
|
(substitute* "test/00/t0077a.sh"
|
||||||
(("ar qc") "ar qcU"))
|
(("ar qc") "ar qcU"))
|
||||||
|
|
||||||
(setenv "SH" (which "sh")))
|
(setenv "SH" (which "sh"))
|
||||||
%standard-phases)))
|
#t)))))
|
||||||
(native-inputs `(("bison" ,bison)
|
(native-inputs `(("bison" ,bison)
|
||||||
;; For building the documentation:
|
;; For building the documentation:
|
||||||
("groff" ,groff)
|
("groff" ,groff)
|
||||||
|
|
Loading…
Reference in a new issue