nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ludovic Courtès 2015-05-05 18:10:30 +02:00 committed by Manolis Ragkousis
parent 2fdcc6074e
commit 5ae4169c5f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
guix/packages.scm
View File

@ -336,8 +336,11 @@ corresponds to the arguments expected by `set-path-environment-variable'."
(string-append (package-name package) "-" (package-version package))) (string-append (package-name package) "-" (package-version package)))
(define (%standard-patch-inputs) (define (%standard-patch-inputs)
(let ((ref (lambda (module var) (let* ((canonical (module-ref (resolve-interface '(gnu packages base))
(module-ref (resolve-interface module) var)))) 'canonical-package))
(ref (lambda (module var)
(canonical
(module-ref (resolve-interface module) var)))))
`(("tar" ,(ref '(gnu packages base) 'tar)) `(("tar" ,(ref '(gnu packages base) 'tar))
("xz" ,(ref '(gnu packages compression) 'xz)) ("xz" ,(ref '(gnu packages compression) 'xz))
("bzip2" ,(ref '(gnu packages compression) 'bzip2)) ("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)) ("lzip" ,(ref '(gnu packages compression) 'lzip))
("unzip" ,(ref '(gnu packages zip) 'unzip)) ("unzip" ,(ref '(gnu packages zip) 'unzip))
("patch" ,(ref '(gnu packages base) 'patch)) ("patch" ,(ref '(gnu packages base) 'patch))
("locales" ,(ref '(gnu packages commencement) ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales)))))
'glibc-utf8-locales-final)))))
(define (default-guile) (define (default-guile)
"Return the default Guile package used to run the build code of "Return the default Guile package used to run the build code of