Keep config files and wrapped ghc for cabal-doctest

Author: hamishmack

builder/comp-builder.nix

@@ -382,7 +382,7 @@ let
       [ghc buildPackages.removeReferencesTo]
       ++ executableToolDepends;
 
-    outputs = ["out"]
+    outputs = ["out" "configFiles" "ghc"]
       ++ (lib.optional enableSeparateDataOutput "data")
       ++ (lib.optional keepSource "source")
       ++ (lib.optional writeHieFiles "hie");
@@ -402,9 +402,10 @@ let
       '') + commonAttrs.prePatch;
 
     configurePhase = ''
-      configFiles=$(mktemp -d)
+      mkdir -p $configFiles
+      mkdir -p $ghc
+      wrappedGhc=$ghc
       ${configFiles.script}
-      wrappedGhc=$(mktemp -d)
       ${shellWrappers.script}
       PATH=$wrappedGhc/bin:$PATH
 

builder/haddock-builder.nix

@@ -63,16 +63,14 @@ let
     name = fullName;
 
     passthru = {
-      configFiles = docsConfigFiles;
-
       # The directory containing the haddock documentation.
       haddockDir = lib.const (if doHaddock' then "${docdir drv.doc}/html" else null);
     };
 
     # `out` contains the `package.conf.d` files used for building the
     # haddock files.
     # `doc` contains just the haddock output files.
-    outputs = ["out"]
+    outputs = ["out" "configFiles" "ghc"]
     ++ lib.optional doHaddock' "doc";
 
     propagatedBuildInputs =
@@ -86,9 +84,10 @@ let
       ++ componentDrv.executableToolDepends;
 
     configurePhase = ''
-      configFiles=$(mktemp -d)
+      mkdir -p $configFiles
+      mkdir -p $ghc
+      wrappedGhc=$ghc
       ${docsConfigFiles.script}
-      wrappedGhc=$(mktemp -d)
       ${shellWrappers.script}
       PATH=$wrappedGhc/bin:$PATH
       runHook preConfigure

builder/setup-builder.nix

@@ -57,7 +57,6 @@ let
         srcSubDir = cleanSrc'.subDir;
         srcSubDirPath = cleanSrc'.root + cleanSrc'.subDir;
         cleanSrc = cleanSrc';
-        inherit configFiles;
         dwarf = self (drvArgs // { enableDWARF = true; });
         smallAddressSpace = self (drvArgs // { smallAddressSpace = true; });
       };
@@ -69,9 +68,9 @@ let
         platforms = if component.platforms == null then lib.platforms.all else component.platforms;
       };
 
+      outputs = ["out" "configFiles"];
       phases = ["unpackPhase" "patchPhase" "buildPhase" "installPhase"];
       buildPhase = ''
-        configFiles=$(mktemp -d)
         mkdir -p $configFiles
         ${configFiles.script}
         runHook preBuild