From 9a224ac2e37482cb69c2803648bf3c66fbc6eee9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Sat, 27 Dec 2014 08:34:43 -0500 Subject: 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. --- gnu/packages/linux.scm | 4 ++-- gnu/packages/mit-krb5.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a2708a290f..9dc5f5cd40 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -196,7 +196,7 @@ (define-public linux-libre (build-phase '(lambda* (#:key system inputs #:allow-other-keys #:rest args) ;; Apply the neat patch. - (system* "patch" "-p1" "--batch" + (system* "patch" "-p1" "--force" "-i" (assoc-ref inputs "patch/freedo+gnu")) (let ((arch (car (string-split system #\-)))) @@ -774,7 +774,7 @@ (define-public net-tools 'unpack 'patch (lambda* (#:key inputs #:allow-other-keys) (define (apply-patch file) - (zero? (system* "patch" "-p1" "--batch" + (zero? (system* "patch" "-p1" "--force" "--input" file))) (let ((patch.gz (assoc-ref inputs "patch"))) diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 2528f46157..3f3e85773e 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -62,7 +62,7 @@ (define-public mit-krb5 ;; XXX The current patch system does not support unusual ;; source unpack methods, so we have to apply this patch in a ;; non-standard way. - (zero? (system* "patch" "-p1" "--batch" "-i" + (zero? (system* "patch" "-p1" "--force" "-i" (assoc-ref %build-inputs "patch/init-fix")))))) (alist-replace 'check -- cgit v1.2.3