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

gnu: Use patch --force instead of --batch. 

* gnu/packages/linux.scm (linux-libre, net-tools): Pass "--force" to patch,
  instead of "--batch".
* gnu/packages/mit-krb5.scm (mit-krb5): Ditto.
This commit is contained in:
Mark H Weaver 2014-12-27 08:34:43 -05:00
parent 6aa47e3883
commit 9a224ac2e3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/linux.scm
View File

@ -196,7 +196,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
(build-phase (build-phase
'(lambda* (#:key system inputs #:allow-other-keys #:rest args) '(lambda* (#:key system inputs #:allow-other-keys #:rest args)
;; Apply the neat patch. ;; Apply the neat patch.
(system* "patch" "-p1" "--batch" (system* "patch" "-p1" "--force"
"-i" (assoc-ref inputs "patch/freedo+gnu")) "-i" (assoc-ref inputs "patch/freedo+gnu"))
(let ((arch (car (string-split system #\-)))) (let ((arch (car (string-split system #\-))))
@ -774,7 +774,7 @@ manpages.")
'unpack 'patch 'unpack 'patch
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(define (apply-patch file) (define (apply-patch file)
(zero? (system* "patch" "-p1" "--batch" (zero? (system* "patch" "-p1" "--force"
"--input" file))) "--input" file)))
(let ((patch.gz (assoc-ref inputs "patch"))) (let ((patch.gz (assoc-ref inputs "patch")))

2
gnu/packages/mit-krb5.scm
View File

@ -62,7 +62,7 @@
;; XXX The current patch system does not support unusual ;; XXX The current patch system does not support unusual
;; source unpack methods, so we have to apply this patch in a ;; source unpack methods, so we have to apply this patch in a
;; non-standard way. ;; non-standard way.
(zero? (system* "patch" "-p1" "--batch" "-i" (zero? (system* "patch" "-p1" "--force" "-i"
(assoc-ref %build-inputs "patch/init-fix")))))) (assoc-ref %build-inputs "patch/init-fix"))))))
(alist-replace (alist-replace
'check 'check