From 00e219d1c98e55dd1b6c6af00ae73c23ed52583e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 3 Nov 2012 21:07:52 +0100
Subject: 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'.
---
 pre-inst-env.in | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'pre-inst-env.in')

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 "$@"
-- 
cgit v1.2.3