guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: pull: Set '%nix-instantiate' to a sensible value.


From: Ludovic Courtès
Subject: 02/03: pull: Set '%nix-instantiate' to a sensible value.
Date: Mon, 28 Nov 2016 21:59:17 +0000 (UTC)

civodul pushed a commit to branch master
in repository guix.

commit c062b1eb6c9d799f0015e26b14cd77eaf8d946dd
Author: Ludovic Courtès <address@hidden>
Date:   Mon Nov 28 22:08:17 2016 +0100

    pull: Set '%nix-instantiate' to a sensible value.
    
    Reported by ng0 <address@hidden>.
    Fixes <http://bugs.gnu.org/25053>.
    
    * guix/build/pull.scm (build-guix): Replace "@NIX_INSTANTIATE@" in
    guix/config.scm with "nix-instantiate".
---
 guix/build/pull.scm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/build/pull.scm b/guix/build/pull.scm
index 871bf6f..6034e93 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]