me
/
guix
Archived
1
0
Fork 0
Code

Add a `system' parameter to `nixpkgs-derivation'. 

* guix/utils.scm (nixpkgs-derivation): Add a `system' parameter.  Pass
  it in the `nix-instantiate' invocation.
master
Ludovic Courtès 2012-10-25 23:42:06 +02:00
parent b642e4b853
commit fbc93bedff
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/utils.scm
View File

@ -460,11 +460,12 @@ starting from the right of S."
;; Capture the build-time value of $NIXPKGS. ;; Capture the build-time value of $NIXPKGS.
(compile-time-value (getenv "NIXPKGS")))) (compile-time-value (getenv "NIXPKGS"))))
(define (nixpkgs-derivation attribute) (define* (nixpkgs-derivation attribute #:optional (system (%current-system)))
"Return the derivation path of ATTRIBUTE in Nixpkgs." "Return the derivation path of ATTRIBUTE in Nixpkgs."
(let* ((p (open-pipe* OPEN_READ (or (getenv "NIX_INSTANTIATE") (let* ((p (open-pipe* OPEN_READ (or (getenv "NIX_INSTANTIATE")
"nix-instantiate") "nix-instantiate")
"-A" attribute (%nixpkgs-directory))) "-A" attribute (%nixpkgs-directory)
"--argstr" "system" system))
(l (read-line p)) (l (read-line p))
(s (close-pipe p))) (s (close-pipe p)))
(and (zero? (status:exit-val s)) (and (zero? (status:exit-val s))