diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-05-10 22:46:19 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-05-10 22:46:19 +0200 |
commit | 94a4b3b9f289963949c197f846ec1882d75f5a1e (patch) | |
tree | 230832cb35b979b25068994ec9240f41960eb2c5 /tests | |
parent | 8c247e1c473d478287ebf2829475259ba3ee7780 (diff) | |
download | guix-94a4b3b9f289963949c197f846ec1882d75f5a1e.tar guix-94a4b3b9f289963949c197f846ec1882d75f5a1e.tar.gz |
package: Make sure the dependencies get built along with the manifest.
Before this, something like "guix package -i glibc" could fail because
glibc lists linux-libre-headers as a propagated input (which would be
added as a dependency in the manifest) but the linux-libre-headers
output could be unavailable, leading to an error like this:
path `/nix/store/4v2bk8sx5cm166gks3fi3q7d9zchibnk-linux-libre-headers-3.3.8' is not valid
This patch adds such dependencies as inputs of the profile derivation.
* guix/scripts/package.scm (profile-derivation): Accept package objects
in the `deps' field of an element of PACKAGES. Convert them to their
output path for BUILDER, and add them to the inputs of the
`build-expression->derivation' call.
(input->name+path): When INPUT doesn't contain a package object,
return it as is.
(guix-package)[process-actions](canonicalize-deps): Expect DEPS to
contain package objects, and leave them as is.
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions