From eb453081092cbee5f8176c1d348ac23e46a24281 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 10 Dec 2020 17:40:00 +0100
Subject: [PATCH] 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
---
 src/nix/installables.cc    | 2 +-
 tests/content-addressed.sh | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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