~ruther/guix-local

9a224ac2e37482cb69c2803648bf3c66fbc6eee9 — Mark H Weaver 11 years ago 6aa47e3
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.
2 files changed, 3 insertions(+), 3 deletions(-)

M gnu/packages/linux.scm
M gnu/packages/mit-krb5.scm
M gnu/packages/linux.scm => gnu/packages/linux.scm +2 -2
@@ 196,7 196,7 @@ for SYSTEM, or #f if there is no configuration for SYSTEM."
         (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 @@ manpages.")
                 '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")))

M gnu/packages/mit-krb5.scm => gnu/packages/mit-krb5.scm +1 -1
@@ 62,7 62,7 @@
                 ;; 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