diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-11-13 00:34:16 +0100 |
commit | 2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b (patch) | |
tree | b0f12de9371ebbd806214df841cf3a1c116d5431 /guix/packages.scm | |
parent | 15abcabe4e1d34416714eae66dba32ff96d05a6f (diff) | |
parent | de7da4e5d14a1acace1a89d9c520d336eecc7e45 (diff) | |
download | guix-patches-2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b.tar guix-patches-2cab1dd58b9a8fb4db8f46a0b00e1358fc0de21b.tar.gz |
Merge branch 'core-updates'
Diffstat (limited to 'guix/packages.scm')
-rw-r--r-- | guix/packages.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index a3fab4dc13..beb958f156 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -493,9 +494,11 @@ specifies modules in scope when evaluating 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" #+@flags "--input" patch))) + "--force" "--no-backup-if-mismatch" + #+@flags "--input" patch))) (define (first-file directory) ;; Return the name of the first file in DIRECTORY. |