From bccff827dc968b08bddda03aadcb3d9cc41c2719 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 17 Nov 2020 13:50:36 +0100
Subject: [PATCH] Fix deadlock in IFD through the daemon

Fixes #4235.
---
 src/libstore/derivations.cc |  6 ++++--
 tests/remote-store.sh       | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 517ecfaa2..eea129df3 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -463,13 +463,15 @@ static const DrvHashModulo & pathDerivationModulo(Store & store, const StorePath
 {
     auto h = drvHashes.find(drvPath);
     if (h == drvHashes.end()) {
-        assert(store.isValidPath(drvPath));
         // Cache it
         h = drvHashes.insert_or_assign(
             drvPath,
             hashDerivationModulo(
                 store,
-                store.readDerivation(drvPath),
+                parseDerivation(
+                    store,
+                    readFile(store.toRealPath(drvPath)),
+                    Derivation::nameFromPath(drvPath)),
                 false)).first;
     }
     return h->second;
diff --git a/tests/remote-store.sh b/tests/remote-store.sh
index 3a61946f9..f7ae1a2ed 100644
--- a/tests/remote-store.sh
+++ b/tests/remote-store.sh
@@ -7,6 +7,20 @@ nix --store ssh-ng://localhost?remote-store=$TEST_ROOT/other-store doctor
 
 startDaemon
 
+# Test import-from-derivation through the daemon.
+[[ $(nix eval --impure --raw --expr '
+  with import ./config.nix;
+  import (
+    mkDerivation {
+      name = "foo";
+      bla = import ./dependencies.nix;
+      buildCommand = "
+        echo \\\"hi\\\" > $out
+      ";
+    }
+  )
+') = hi ]]
+
 storeCleared=1 NIX_REMOTE_=$NIX_REMOTE $SHELL ./user-envs.sh
 
 nix-store --dump-db > $TEST_ROOT/d1