Revert "Make `nix shell` fallback to static outputs when needed"

This reverts commit 8d66f5f1107fe87f70ea24ade045720235cc31fa.

This fix isn't needed anymore now that the realisations are always
properly registered

1 files changed, 3 insertions, 12 deletions

diff --git a/src/libcmd/installables.cc b/src/libcmd/installables.cc
index 10855688c..06ef4c669 100644
--- a/src/libcmd/installables.cc
+++ b/src/libcmd/installables.cc
@@ -736,18 +736,9 @@ std::set<RealisedPath> toRealisedPaths(
                                     output.first);
                             auto outputId = DrvOutput{outputHashes.at(output.first), output.first};
                             auto realisation = store->queryRealisation(outputId);
-                            if (!realisation) {
-                                // TODO: remove this check once #4725 is fixed
-                                // as we’ll have the guaranty that if
-                                // `output.second` exists, then the realisation
-                                // will be there too
-                                if (output.second)
-                                    res.insert(*output.second);
-                                else
-                                    throw Error("cannot operate on an output of unbuilt content-addresed derivation '%s'", outputId.to_string());
-                            } else {
-                                res.insert(RealisedPath{*realisation});
-                            }
+                            if (!realisation)
+                                throw Error("cannot operate on an output of unbuilt content-addresed derivation '%s'", outputId.to_string());
+                            res.insert(RealisedPath{*realisation});
                         }
                         else {
                             // If ca-derivations isn't enabled, behave as if