summaryrefslogtreecommitdiff
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
parent45779fa676419de8838cb26b6c7a24678a2be1cd (diff)
downloadpatches-e8cb9c01c684bed2f47767f0b322f3d40d89781a.tar
patches-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.
-rw-r--r--build-aux/build-self.scm10
-rw-r--r--configure.ac9
-rw-r--r--guix/config.scm.in4
-rw-r--r--guix/import/snix.scm4
-rw-r--r--guix/self.scm12
5 files changed, 10 insertions, 29 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")))))))
;;;
diff --git a/configure.ac b/configure.ac
index b866e91b2c..b34f15a77b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,18 +160,11 @@ AC_ARG_WITH([nix-prefix],
esac],
[])
-AC_PATH_PROG([NIX_INSTANTIATE], [nix-instantiate])
AC_PATH_PROG([NIX_HASH], [nix-hash])
-if test "x$guix_build_daemon$NIX_INSTANTIATE$NIX_HASH" = "xno"; then
+if test "x$guix_build_daemon$NIX_HASH" = "xno"; then
AC_MSG_ERROR([Nix programs not found; please install Nix or use `--with-nix-prefix'.])
fi
-if test "x$NIX_INSTANTIATE" = "x"; then
- # This program is an optional dependency, so we just want it to be
- # taken from $PATH if it's not available right now.
- NIX_INSTANTIATE="nix-instantiate"
-fi
-
AC_ARG_WITH([nixpkgs],
[AS_HELP_STRING([--with-nixpkgs=DIR],
[search for Nixpkgs in DIR (for testing purposes only)])],
diff --git a/guix/config.scm.in b/guix/config.scm.in
index 4490112e07..1a761b912e 100644
--- a/guix/config.scm.in
+++ b/guix/config.scm.in
@@ -35,7 +35,6 @@
%system
%libgcrypt
%libz
- %nix-instantiate
%gzip
%bzip2
%xz))
@@ -95,9 +94,6 @@
(define %libz
"@LIBZ@")
-(define %nix-instantiate
- "@NIX_INSTANTIATE@")
-
(define %gzip
"@GZIP@")
diff --git a/guix/import/snix.scm b/guix/import/snix.scm
index 778768ff2d..56934e8cf9 100644
--- a/guix/import/snix.scm
+++ b/guix/import/snix.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -283,7 +283,7 @@ ATTRIBUTE is true, only that attribute is considered."
platform = (import ~a/pkgs/top-level/platforms.nix).sheevaplug;
}" nixpkgs)))
(apply open-pipe* OPEN_READ
- %nix-instantiate "--strict" "--eval-only" "--xml"
+ "nix-instantiate" "--strict" "--eval-only" "--xml"
;; Pass a dummy `crossSystem' argument so that `buildInputs' and
;; `nativeBuildInputs' are not coalesced.
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))