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

gnu: ninja: Apply the patch in a phase to avoid 'patch-and-repack'. 

* gnu/packages/ninja.scm (ninja)[source]: Comment out 'patches' field.
  [native-inputs]: Add 'patch' and "ninja-tests.patch".  Move above
  'arguments' field.
  [arguments]: Add 'apply-ninja-tests.patch' phase.
This commit is contained in:
Mark H Weaver 2015-07-17 21:46:14 -04:00
parent b40c3d09b5
commit 47f315a73f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/ninja.scm
View File

@ -23,6 +23,7 @@
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages python))
(define-public ninja
@ -37,11 +38,23 @@
(sha256
(base32
"1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw"))
(patches (list (search-patch "ninja-tests.patch")))))
;; XXX Ninja's build system doesn't cope well with zeroed
;; time stamps in the source tree, so we must avoid using
;; 'patch-and-repack'.
#; (patches (list (search-patch "ninja-tests.patch")))))
(build-system gnu-build-system)
(native-inputs `(("python" ,python-2)
("patch" ,patch)
("ninja-tests.patch" ,(search-patch "ninja-tests.patch"))))
(arguments
'(#:phases
(modify-phases %standard-phases
(add-after
'unpack 'apply-ninja-tests.patch
;; XXX Apply the patch here to avoid 'patch-and-repack'. See above.
(lambda* (#:key inputs #:allow-other-keys)
(zero? (system* "patch" "--force" "-p1" "-i"
(assoc-ref inputs "ninja-tests.patch")))))
(replace
'configure
(lambda _
@ -70,7 +83,6 @@
(copy-file "doc/manual.asciidoc"
(string-append doc "/manual.asciidoc"))
#t))))))
(native-inputs `(("python" ,python-2)))
(home-page "http://martine.github.io/ninja/")
(synopsis "Small build system")
(description