diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-12-11 15:01:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 15:01:49 +0100 |
| commit | 9c143c411b2190a05907416266b0022e5b17dd02 (patch) | |
| tree | ea5a8d801015114142071dd837ab1e2a8e041c58 | |
| parent | c6a1bcd0ec1ed443947ae7151e32dd6827dfe53e (diff) | |
| parent | eb453081092cbee5f8176c1d348ac23e46a24281 (diff) | |
Merge pull request #4350 from NixOS/ca/fix-build-with-nix-command
Fix the `nix` command with CA derivations
| -rw-r--r-- | src/nix/installables.cc | 2 | ||||
| -rw-r--r-- | tests/content-addressed.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/nix/installables.cc b/src/nix/installables.cc index b6ed030af..3506c3fcc 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -409,7 +409,7 @@ std::vector<InstallableValue::DerivationInfo> InstallableAttrPath::toDerivations for (auto & drvInfo : drvInfos) { res.push_back({ state->store->parseStorePath(drvInfo.queryDrvPath()), - state->store->parseStorePath(drvInfo.queryOutPath()), + state->store->maybeParseStorePath(drvInfo.queryOutPath()), drvInfo.queryOutputName() }); } diff --git a/tests/content-addressed.sh b/tests/content-addressed.sh index 03eff549c..bc37a99c1 100644 --- a/tests/content-addressed.sh +++ b/tests/content-addressed.sh @@ -50,7 +50,13 @@ testGC () { nix-collect-garbage --experimental-features ca-derivations --option keep-derivations true } +testNixCommand () { + clearStore + nix build --experimental-features 'nix-command ca-derivations' --file ./content-addressed.nix --no-link +} + testRemoteCache testDeterministicCA testCutoff testGC +testNixCommand |