~ruther/guix-local: packages: Use packages from '%final-inputs' as the default patch inputs.

5ae4169c5ffef716148e7d3c92fdd49c0b2f7ded — Ludovic Courtès 11 years ago 2fdcc60

packages: Use packages from '%final-inputs' as the default patch inputs.

Reported by Manolis Ragkousis <manolis837@gmail.com>
at <http://lists.gnu.org/archive/html/guix-devel/2015-05/msg00059.html>.

* guix/packages.scm (%standard-patch-inputs): Add 'canonical', and use
  it in 'ref'.

patch browse .tar.gz

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

M guix/packages.scm

M guix/packages.scm => guix/packages.scm +6 -4

@@ 336,8 336,11 @@ corresponds to the arguments expected by `set-path-environment-variable'."
   (string-append (package-name package) "-" (package-version package)))
 
 (define (%standard-patch-inputs)
-  (let ((ref (lambda (module var)
-               (module-ref (resolve-interface module) var))))
+  (let* ((canonical (module-ref (resolve-interface '(gnu packages base))
+                                'canonical-package))
+         (ref       (lambda (module var)
+                      (canonical
+                       (module-ref (resolve-interface module) var)))))
     `(("tar"   ,(ref '(gnu packages base) 'tar))
       ("xz"    ,(ref '(gnu packages compression) 'xz))
       ("bzip2" ,(ref '(gnu packages compression) 'bzip2))


@@ 345,8 348,7 @@ corresponds to the arguments expected by `set-path-environment-variable'."
       ("lzip"  ,(ref '(gnu packages compression) 'lzip))
       ("unzip" ,(ref '(gnu packages zip) 'unzip))
       ("patch" ,(ref '(gnu packages base) 'patch))
-      ("locales" ,(ref '(gnu packages commencement)
-                       'glibc-utf8-locales-final)))))
+      ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales)))))
 
 (define (default-guile)
   "Return the default Guile package used to run the build code of