diff options
Diffstat (limited to 'guix/packages.scm')
| -rw-r--r-- | guix/packages.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index c955b35155..cbe6127f28 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -315,8 +315,11 @@ representation." (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)) @@ -324,8 +327,7 @@ representation." ("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 @@ -445,7 +447,7 @@ IMPORTED-MODULES specify modules to use/import for use by SNIPPET." ;; SOURCE may be either a directory or a tarball. (and (if (file-is-directory? #+source) - (let* ((store (or (getenv "NIX_STORE") "/gnu/store")) + (let* ((store (%store-directory)) (len (+ 1 (string-length store))) (base (string-drop #+source len)) (dash (string-index base #\-)) |