From e8cb9c01c684bed2f47767f0b322f3d40d89781a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 18 Jun 2018 22:53:25 +0200 Subject: 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. --- guix/self.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'guix/self.scm') diff --git a/guix/self.scm b/guix/self.scm index cce418df41..8a474ffb54 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -655,7 +655,7 @@ assumed to be part of MODULES." (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. @@ -696,8 +696,7 @@ assumed to be part of MODULES." %libz %gzip %bzip2 - %xz - %nix-instantiate)) + %xz)) #$@(map (match-lambda ((name . value) @@ -721,13 +720,10 @@ assumed to be part of MODULES." (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")))) ;; Guile 2.0 *requires* the 'define-module' to be at the - ;; top-level or it 'toplevel-ref' in the resulting .go file are + ;; top-level or the 'toplevel-ref' in the resulting .go file are ;; made relative to a nonexistent anonymous module. #:splice? #t)) -- cgit v1.2.3