~ruther/guix-local: Add a `system' parameter to `nixpkgs-derivation'.

fbc93bedff2a419305038564232837aff52513d2 — Ludovic Courtès 13 years ago b642e4b

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

* guix/utils.scm (nixpkgs-derivation): Add a `system' parameter.  Pass
  it in the `nix-instantiate' invocation.

patch browse .tar.gz

1 files changed, 3 insertions(+), 2 deletions(-)

M guix/utils.scm

M guix/utils.scm => guix/utils.scm +3 -2

@@ 460,11 460,12 @@ starting from the right of S."
    ;; Capture the build-time value of $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."
   (let* ((p (open-pipe* OPEN_READ (or (getenv "NIX_INSTANTIATE")
                                       "nix-instantiate")
-                        "-A" attribute (%nixpkgs-directory)))
+                        "-A" attribute (%nixpkgs-directory)
+                        "--argstr" "system" system))
          (l (read-line p))
          (s (close-pipe p)))
     (and (zero? (status:exit-val s))