diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-11-03 21:07:52 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-11-03 21:11:28 +0100 |
| commit | 00e219d1c98e55dd1b6c6af00ae73c23ed52583e (patch) | |
| tree | 28565d9ddd0ed72f7d35b0500b61745e3e7412d2 /pre-inst-env.in | |
| parent | e76bdf8b87920b87a2a2e728c2e40ff24ca39ffe (diff) | |
build: Produce (guix config) instead of using compile-time tricks.
* guix/config.scm.in: New file.
* guix/utils.scm: Use it.
(%libgcrypt): Remove.
(%nixpkgs-directory): Don't capture the compile-time $NIXPKGS; use
%NIXPKGS instead.
(nixpkgs-derivation): Use %NIX-INSTANTIATE.
* pre-inst-env.in (NIX_INSTANTIATE, NIXPKGS, LIBGCRYPT): Remove.
* configure.ac: Emit `guix/config.scm'.
* Makefile.am (GOBJECTS): Add `guix/config.go'.
(nobase_nodist_guilemodule_DATA): Add `guix/config.scm'.
Diffstat (limited to 'pre-inst-env.in')
| -rw-r--r-- | pre-inst-env.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pre-inst-env.in b/pre-inst-env.in index 2fb60e2edd..d90934c184 100644 --- a/pre-inst-env.in +++ b/pre-inst-env.in @@ -41,10 +41,7 @@ export PATH # auto-compilation. NIX_HASH="@NIX_HASH@" -NIX_INSTANTIATE="@NIX_INSTANTIATE@" -NIXPKGS="@NIXPKGS@" -LIBGCRYPT="@LIBGCRYPT@" -export NIX_HASH NIX_INSTANTIATE NIXPKGS LIBGCRYPT +export NIX_HASH exec "$@" |