~ruther/guix-local

94264407815da63c5f07a519cd41838e35ab464e — Ludovic Courtès 11 years ago c4a1b6c
packages: Apply patches with "patch --force".

Fixes <http://bugs.gnu.org/19402>.
Reported by Mark H Weaver <mhw@netris.org>.

* guix/packages.scm (patch-and-repack): Change "--batch" to "--force".
1 files changed, 4 insertions(+), 1 deletions(-)

M guix/packages.scm
M guix/packages.scm => guix/packages.scm +4 -1
@@ 398,7 398,10 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET."
         (define (apply-patch input)
           (let ((patch* (assoc-ref %build-inputs input)))
             (format (current-error-port) "applying '~a'...~%" patch*)
             (zero? (system* patch "--batch" ,@flags "--input" patch*))))

             ;; Use '--force' so that patches that do not apply perfectly are
             ;; rejected.
             (zero? (system* patch "--force" ,@flags "--input" patch*))))

         (define (first-file directory)
           ;; Return the name of the first file in DIRECTORY.