Fix (p.shellFor {}).ghc

Author: hamishmack

builder/ghc-for-component-wrapper.nix

@@ -147,6 +147,7 @@ let
   drv = runCommand "${componentName}-${ghc.name}-env" {
   preferLocalBuild = true;
   passthru = {
+    inherit targetPrefix;
     inherit (ghc) version meta;
   };
   propagatedBuildInputs = configFiles.libDeps;
@@ -161,4 +162,4 @@ let
 in {
   inherit script drv targetPrefix;
   baseGhc = ghc;
-}
+}

builder/shell-for.nix

@@ -181,7 +181,7 @@ in
     NIX_GHC_LIBDIR = ghcEnv.drv + "/" + configFiles.libDir;
 
     passthru = (mkDrvArgs.passthru or {}) // {
-      ghc = ghcEnv;
+      ghc = ghcEnv.drv;
       inherit configFiles;
     };
   } // lib.optionalAttrs exactDeps {