From 00e219d1c98e55dd1b6c6af00ae73c23ed52583e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= 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'. --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e6b254ae44..eb4238f0b0 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ config.cache /guix-download /distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz /guix-package +/guix/config.scm -- cgit v1.2.3