diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-05-05 18:10:30 +0200 |
|---|---|---|
| committer | Manolis Ragkousis <manolis837@gmail.com> | 2015-05-21 15:28:01 +0300 |
| commit | 5ae4169c5ffef716148e7d3c92fdd49c0b2f7ded (patch) | |
| tree | b2e4c8ccf2eea7081e5fad442ee87af36707890c | |
| parent | 2fdcc6074e61ed6375f624c671e8c0fae7bd94b0 (diff) | |
| download | guix-5ae4169c5ffef716148e7d3c92fdd49c0b2f7ded.tar.gz guix-5ae4169c5ffef716148e7d3c92fdd49c0b2f7ded.zip | |
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'.
| -rw-r--r-- | guix/packages.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index f6dda451ad..d5bf6dbf65 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -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 |