Fix the nix command with CA derivations

Prevents a crash because most `nix` subcommands assumed that derivations know their output path, which isn't the case for CA derivations
NixOS · Dec 11, 2020 · eb45308 · eb45308
1 parent 253571e
commit eb45308
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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