From b86b00567c82e0e16a3cfa65b3f87d95f31506bb Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 14 Aug 2012 18:36:01 +0200
Subject: build: Pass $(NIX_INSTANTIATE) to the build and test environments.

* Makefile.am (.scm.go): Define $NIX_INSTANTIATE.
  (TESTS_ENVIRONMENT): Likewise, and define $NIX_HASH.
* guix/utils.scm (nixpkgs-derivation): Use $NIX_INSTANTIATE when
  defined.

* tests/utils.scm (%nix-hash): New variable.
  ("sha256 & bytevector->nix-base32-string"): Use it.
---
 guix/utils.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'guix/utils.scm')

diff --git a/guix/utils.scm b/guix/utils.scm
index 66563c727e..cbd51fae73 100644
--- a/guix/utils.scm
+++ b/guix/utils.scm
@@ -450,8 +450,9 @@ starting from the right of S."
 
 (define (nixpkgs-derivation attribute)
   "Return the derivation path of ATTRIBUTE in Nixpkgs."
-  (let* ((p (open-pipe* OPEN_READ "nix-instantiate" "-A"
-                        attribute (%nixpkgs-directory)))
+  (let* ((p (open-pipe* OPEN_READ (or (getenv "NIX_INSTANTIATE")
+                                      "nix-instantiate")
+                        "-A" attribute (%nixpkgs-directory)))
          (l (read-line p))
          (s (close-pipe p)))
     (and (zero? (status:exit-val s))
-- 
cgit v1.2.3