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 /Makefile.am | |
| 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 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 0621cb8c00..b06f575e6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,7 @@ MODULES = \ distro/packages/ld-wrapper.scm \ distro/packages/typesetting.scm -GOBJECTS = $(MODULES:%.scm=%.go) +GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go nobase_dist_guilemodule_DATA = $(MODULES) @@ -112,7 +112,7 @@ distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz: guix/utils.go $(MKDIR_P) `dirname "$@"` $(DOWNLOAD_FILE) "$@" "93b537766dfab3ad287143523751e3ec02dd32d3ccaf88ad2d31c63158f342ee" -nobase_nodist_guilemodule_DATA = $(GOBJECTS) +nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm TESTS = \ tests/builders.scm \ |