aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-06-18 22:53:25 +0200
committerLudovic Courtès <ludo@gnu.org>2018-06-18 23:19:51 +0200
commite8cb9c01c684bed2f47767f0b322f3d40d89781a (patch)
tree45b21cca80a01b1515b1594f2db7d0c2263856c0 /build-aux
parent45779fa676419de8838cb26b6c7a24678a2be1cd (diff)
downloadguix-e8cb9c01c684bed2f47767f0b322f3d40d89781a.tar
guix-e8cb9c01c684bed2f47767f0b322f3d40d89781a.tar.gz
build: Remove checks for 'nix-instantiate'.
* guix/import/snix.scm (open-nixpkgs): Use "nix-instantiate" unconditionally. * configure.ac: Remove check for 'nix-instantiate'. * guix/config.scm.in (%nix-instantiate): Remove. * guix/self.scm (%dependency-variables): Remove '%nix-instantiate'. (make-config.scm): Remove it from the generated "config.scm". * build-aux/build-self.scm (%dependency-variables, make-config.scm): Likewise.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/build-self.scm10
1 files changed, 3 insertions, 7 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 4de91f7fff..6af329b257 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -53,7 +53,7 @@
(define %dependency-variables
;; (guix config) variables corresponding to dependencies.
- '(%libgcrypt %libz %xz %gzip %bzip2 %nix-instantiate))
+ '(%libgcrypt %libz %xz %gzip %bzip2))
(define %persona-variables
;; (guix config) variables that define Guix's persona.
@@ -94,8 +94,7 @@
%libz
%gzip
%bzip2
- %xz
- %nix-instantiate))
+ %xz))
;; XXX: Work around <http://bugs.gnu.org/15602>.
(eval-when (expand load eval)
@@ -121,10 +120,7 @@
(file-append libgcrypt "/lib/libgcrypt")))
(define %libz
#+(and zlib
- (file-append zlib "/lib/libz")))
-
- (define %nix-instantiate ;for (guix import snix)
- "nix-instantiate")))))
+ (file-append zlib "/lib/libz")))))))
;;;