diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-06-18 22:53:25 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-06-18 23:19:51 +0200 |
| commit | e8cb9c01c684bed2f47767f0b322f3d40d89781a (patch) | |
| tree | 45b21cca80a01b1515b1594f2db7d0c2263856c0 /guix/import | |
| parent | 45779fa676419de8838cb26b6c7a24678a2be1cd (diff) | |
| download | guix-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 'guix/import')
| -rw-r--r-- | guix/import/snix.scm | 4 |
1 files changed, 2 insertions, 2 deletions
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. |