aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-11-28 22:08:17 +0100
committerLudovic Courtès <ludo@gnu.org>2016-11-28 22:58:18 +0100
commitc062b1eb6c9d799f0015e26b14cd77eaf8d946dd (patch)
tree5395f0715de742765778becdc80af559b5398bdd
parent9a5187b687e659da86000b32c951e2f55e1f74bb (diff)
downloadguix-c062b1eb6c9d799f0015e26b14cd77eaf8d946dd.tar
guix-c062b1eb6c9d799f0015e26b14cd77eaf8d946dd.tar.gz
pull: Set '%nix-instantiate' to a sensible value.
Reported by ng0 <ng0@libertad.pw>. Fixes <http://bugs.gnu.org/25053>. * guix/build/pull.scm (build-guix): Replace "@NIX_INSTANTIATE@" in guix/config.scm with "nix-instantiate".
-rw-r--r--guix/build/pull.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/build/pull.scm b/guix/build/pull.scm
index 871bf6f535..6034e93cbf 100644
--- a/guix/build/pull.scm
+++ b/guix/build/pull.scm
@@ -84,7 +84,7 @@ containing the source code. Write any debugging output to DEBUG-PORT."
(("@GZIP@") (string-append gzip "/bin/gzip"))
(("@BZIP2@") (string-append bzip2 "/bin/bzip2"))
(("@XZ@") (string-append xz "/bin/xz"))
- (("@NIX_INSTANTIATE@") "")) ;remnants from the past
+ (("@NIX_INSTANTIATE@") "nix-instantiate")) ;for (guix import nix)
;; Augment the search path so Scheme code can be compiled.
(set! %load-path (cons out %load-path))