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 /configure.ac | |
| parent | e76bdf8b87920b87a2a2e728c2e40ff24ca39ffe (diff) | |
| download | patches-00e219d1c98e55dd1b6c6af00ae73c23ed52583e.tar patches-00e219d1c98e55dd1b6c6af00ae73c23ed52583e.tar.gz | |
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 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 85bd20e2be..6d3d1482b4 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ AC_SUBST([LIBGCRYPT]) AC_CONFIG_FILES([Makefile po/Makefile.in + guix/config.scm guix-build guix-download guix-package |