>From bcd636eff01f39583e8742b123d51550f9500795 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 19 May 2016 19:11:58 +0300 Subject: [PATCH] packages: Use '--no-backup-if-mismatch' for patching. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested-by: Ludovic Courtès * guix/packages.scm (patch-and-repack)[build]: Use '--no-backup-if-mismatch' patch flag to avoid making *.orig files. --- guix/packages.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index d62d1f3..a7b502c 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -464,9 +464,11 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." (format (current-error-port) "applying '~a'...~%" patch) ;; Use '--force' so that patches that do not apply perfectly are - ;; rejected. + ;; rejected. Use '--no-backup-if-mismatch' to prevent making + ;; "*.orig" file if a patch is applied with offset. (zero? (system* (string-append #+patch "/bin/patch") - "--force" address@hidden "--input" patch))) + "--force" "--no-backup-if-mismatch" + address@hidden "--input" patch))) (define (first-file directory) ;; Return the name of the first file in DIRECTORY. -- 2.7.3