~ruther/guix-local: gnu: glibc/linux: Fix build of glibc-intermediate.

c2e4f14ac8cd3e1ce7f46a192ad0c9acc084b210 — Ricardo Wurmus 8 years ago dc00f63

gnu: glibc/linux: Fix build of glibc-intermediate.

This is a follow-up to commit b2fd8f63679aa4f244c36fdca62f23c00b8eded9.

* gnu/packages/base.scm (glibc/linux)[arguments]: Take patch from either
native-inputs or just inputs; fix syntax error; report errors on patch
failure.

patch browse .tar.gz

1 files changed, 7 insertions(+), 4 deletions(-)

M gnu/packages/base.scm

M gnu/packages/base.scm => gnu/packages/base.scm +7 -4

@@ 670,10 670,13 @@ store.")
                       ;; TODO: Move the patch to 'patches' in the next update cycle.
                       ,@(if (string-prefix? "i686" (or (%current-target-system)
                                                        (%current-system)))
-                            `(zero? (system* "patch" "-p1" "--force"
-                                             "--input"
-                                             (assoc-ref native-inputs
-                                                        "glibc-memchr-overflow-i686.patch")))
+                            `((unless (zero? (system* "patch" "-p1" "--force"
+                                                      "--input"
+                                                      (or (assoc-ref native-inputs
+                                                                     "glibc-memchr-overflow-i686.patch")
+                                                          (assoc-ref inputs
+                                                                     "glibc-memchr-overflow-i686.patch"))))
+                                (error "patch failed for glibc-memchr-overflow-i686.patch")))
                             '())
 
                       ;; Have `system' use that Bash.