diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 21:56:34 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2020-09-05 22:30:04 +0300 |
| commit | de3c03a47160dec355d9b19ad5ca210d90c15fd7 (patch) | |
| tree | 4ca6dc05b5fc9530d812bbb269f1c61ab9efccf3 /build-aux | |
| parent | ab6fe9d362046231ad6f46eccfd1ea2c9c80b401 (diff) | |
| parent | b8477cab7bccc4191ed3dfa3f149aec7917834d8 (diff) | |
| download | guix-de3c03a47160dec355d9b19ad5ca210d90c15fd7.tar.gz guix-de3c03a47160dec355d9b19ad5ca210d90c15fd7.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/build-self.scm | 8 | ||||
| -rw-r--r-- | build-aux/pre-inst-env.in | 9 |
2 files changed, 3 insertions, 14 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index e2495919d5..4b6e2bfae5 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -71,7 +71,7 @@ (variables rest ...)))))) (variables %localstatedir %storedir %sysconfdir %system))) -(define* (make-config.scm #:key zlib gzip xz bzip2 +(define* (make-config.scm #:key gzip xz bzip2 (package-name "GNU Guix") (package-version "0") (bug-report-address "bug-guix@gnu.org") @@ -133,11 +133,7 @@ (define %bzip2 #+(and bzip2 (file-append bzip2 "/bin/bzip2"))) (define %xz - #+(and xz (file-append xz "/bin/xz"))) - - (define %libz - #+(and zlib - (file-append zlib "/lib/libz"))))))) + #+(and xz (file-append xz "/bin/xz"))))))) ;;; diff --git a/build-aux/pre-inst-env.in b/build-aux/pre-inst-env.in index e0aa7fe868..cd90a06cbc 100644 --- a/build-aux/pre-inst-env.in +++ b/build-aux/pre-inst-env.in @@ -1,7 +1,7 @@ #!/bin/sh # GNU Guix --- Functional package management for GNU -# Copyright © 2012, 2013, 2014, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2012, 2013, 2014, 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # Copyright © 2017 Eric Bavier <bavier@cray.com> # # This file is part of GNU Guix. @@ -46,13 +46,6 @@ export PATH GUIX="$abs_top_builddir/scripts/guix" export GUIX -# The following variables need only be defined when compiling Guix -# modules, but we define them to be on the safe side in case of -# auto-compilation. - -NIX_HASH="@NIX_HASH@" -export NIX_HASH - # Define $GUIX_UNINSTALLED to prevent `guix' from # prepending @guilemoduledir@ to the Guile load paths. |