ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-25 20:19:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add `nixpkgs-derivation*'; use it in the distro.

Browse source 
* guix/utils.scm (nixpkgs-derivation*): New macro.

* distro/base.scm: Use it instead of `nixpkgs-derivation'.
This commit is contained in:
Ludovic Courtès 2012-07-11 17:26:43 +02:00
parent fd33c82c43
commit ce5d658c5c
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
distro/base.scm
View file

@ -211,7 +211,7 @@ (define-public libtool
"0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk")))) "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("m4" ,m4) (native-inputs `(("m4" ,m4)
("perl" ,(nixpkgs-derivation "perl")))) ("perl" ,(nixpkgs-derivation* "perl"))))
(description "GNU Libtool, a generic library support script") (description "GNU Libtool, a generic library support script")
(long-description (long-description
"GNU libtool is a generic library support script. Libtool hides the "GNU libtool is a generic library support script. Libtool hides the
@ -290,7 +290,7 @@ (define-public guile-1.8
(inputs `(("patch/snarf" (inputs `(("patch/snarf"
,(search-path %load-path "distro/guile-1.8-cpp-4.5.patch")) ,(search-path %load-path "distro/guile-1.8-cpp-4.5.patch"))
("gawk" ,gawk) ("gawk" ,gawk)
("readline" ,(nixpkgs-derivation "readline")))) ("readline" ,(nixpkgs-derivation* "readline"))))
;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be ;; Since `guile-1.8.pc' has "Libs: ... -lgmp -lltdl", these must be
;; propagated. ;; propagated.
@ -320,10 +320,10 @@ (define-public guile-2.0
(base32 (base32
"000ng5qsq3cl1k35jvzvhwxj92wx4q87745n2fppkd4irh58vv5l")))) "000ng5qsq3cl1k35jvzvhwxj92wx4q87745n2fppkd4irh58vv5l"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("xz" ,(nixpkgs-derivation "xz")) (native-inputs `(("xz" ,(nixpkgs-derivation* "xz"))
("pkgconfig" ,(nixpkgs-derivation "pkgconfig")))) ("pkgconfig" ,(nixpkgs-derivation* "pkgconfig"))))
(inputs `(("libffi" ,(nixpkgs-derivation "libffi")) (inputs `(("libffi" ,(nixpkgs-derivation* "libffi"))
("readline" ,(nixpkgs-derivation "readline")))) ("readline" ,(nixpkgs-derivation* "readline"))))
(propagated-inputs (propagated-inputs
`( ;; These ones aren't normally needed here, but since `libguile-2.0.la' `( ;; These ones aren't normally needed here, but since `libguile-2.0.la'
@ -335,7 +335,7 @@ (define-public guile-2.0
;; The headers and/or `guile-2.0.pc' refer to these packages, so they ;; The headers and/or `guile-2.0.pc' refer to these packages, so they
;; must be propagated. ;; must be propagated.
("bdw-gc" ,(nixpkgs-derivation "boehmgc")) ("bdw-gc" ,(nixpkgs-derivation* "boehmgc"))
("gmp" ,gmp))) ("gmp" ,gmp)))
(self-native-input? #t) (self-native-input? #t)
@ -366,8 +366,8 @@ (define (guile-reader guile)
(base32 (base32
"1svlyk5pm4fsdp2g7n6qffdl6fdggxnlicj0jn9s4lxd63gzxy1n")))) "1svlyk5pm4fsdp2g7n6qffdl6fdggxnlicj0jn9s4lxd63gzxy1n"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkgconfig" ,(nixpkgs-derivation "pkgconfig")) (native-inputs `(("pkgconfig" ,(nixpkgs-derivation* "pkgconfig"))
("gperf" ,(nixpkgs-derivation "gperf")))) ("gperf" ,(nixpkgs-derivation* "gperf"))))
(inputs `(("guile" ,guile))) (inputs `(("guile" ,guile)))
(description "Guile-Reader, a simple framework for building readers for (description "Guile-Reader, a simple framework for building readers for
GNU Guile") GNU Guile")
@ -462,7 +462,7 @@ (define out
"12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq")))) "12gkyqrn0kaa8xq7sc7v3wm407pz2fxg9ngc75aybhi5z825b9vq"))))
(build-system gnu-build-system) ; actually, just a makefile (build-system gnu-build-system) ; actually, just a makefile
(outputs '("out" "doc")) (outputs '("out" "doc"))
(inputs `(("ghostscript" ,(nixpkgs-derivation "ghostscript")))) (inputs `(("ghostscript" ,(nixpkgs-derivation* "ghostscript"))))
(arguments `(#:modules ((guix build utils) (arguments `(#:modules ((guix build utils)
(guix build gnu-build-system) (guix build gnu-build-system)
(srfi srfi-1)) ; we need SRFI-1 (srfi srfi-1)) ; we need SRFI-1

5
guix/utils.scm
View file

@ -43,6 +43,7 @@ (define-module (guix utils)
%nixpkgs-directory %nixpkgs-directory
nixpkgs-derivation nixpkgs-derivation
nixpkgs-derivation*
define-record-type* define-record-type*
compile-time-value compile-time-value
@ -457,6 +458,10 @@ (define (nixpkgs-derivation attribute)
(not (eof-object? l)) (not (eof-object? l))
l))) l)))
(define-syntax-rule (nixpkgs-derivation* attribute)
"Evaluate the given Nixpkgs derivation at compile-time."
(compile-time-value (nixpkgs-derivation attribute)))
;;; ;;;
;;; Miscellaneous. ;;; Miscellaneous.