summaryrefslogtreecommitdiff
path: root/guix/gexp.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-06-30 23:23:06 +0200
committerLudovic Courtès <ludo@gnu.org>2015-07-01 23:29:49 +0200
commit6b6298ae39bfe185ce1ab18bb3d641ddfad17c8f (patch)
tree9033f05ea626c88134fa31aec72669e8bb9f1b60 /guix/gexp.scm
parentcad252644930b81021484dfdb9d321c61f218842 (diff)
downloadgnu-guix-6b6298ae39bfe185ce1ab18bb3d641ddfad17c8f.tar
gnu-guix-6b6298ae39bfe185ce1ab18bb3d641ddfad17c8f.tar.gz
environment: Add only the specified outputs of the dependencies.
Before that, 'guix environment guile' (for instance) would define environment variables that would refer to the "include" output of Bash, the "debug" output of libgc, etc., even though these are not listed as inputs in the recipe of 'guile'. * guix/gexp.scm (lower-inputs): Export. * guix/scripts/environment.scm (evaluate-input-search-paths): Remove 'derivations' parameter; add 'search-paths'. Expect 'inputs' to be a list of tuples. Adjust callers. (create-environment): Remove 'derivations' parameter; add 'search-paths'. (show-search-paths): Likewise. (package+propagated-inputs): New procedure. (packages->transitive-inputs, packages+propagated-inputs): Remove. (build-inputs): Expect INPUTS to be a list of derivation tuples. (guix-environment): Compute INPUTS using 'package+propagated-inputs', 'package->bag', and 'bag-transitive-inputs'. Move 'run-with-store' higher. * tests/guix-environment.sh: Add test with FINDUTILS-BOOT0.
Diffstat (limited to 'guix/gexp.scm')
-rw-r--r--guix/gexp.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 0b5c43e2b8..09b51b3936 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -52,7 +52,9 @@
compiled-modules
define-gexp-compiler
- gexp-compiler?))
+ gexp-compiler?
+
+ lower-inputs))
;;; Commentary:
;;;