Merge branch 'master' into structured-attrs-shell

 Conflicts:
        src/nix/develop.cc
        src/nix/get-env.sh
        tests/shell.nix

1 files changed, 6 insertions, 0 deletions

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 519cbd5bb..29be46cf5 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -392,6 +392,12 @@ static void main_nix_build(int argc, char * * argv)
 
         if (dryRun) return;
 
+        if (settings.isExperimentalFeatureEnabled("ca-derivations")) {
+            auto resolvedDrv = drv.tryResolve(*store);
+            assert(resolvedDrv && "Successfully resolved the derivation");
+            drv = *resolvedDrv;
+        }
+
         // Set the environment.
         auto env = getEnv();