Fix iserv-proxy in dev shells

Author: hamishmack

builder/default.nix

@@ -41,7 +41,7 @@ let
   # component builder and for nix-shells.
   ghcForComponent = import ./ghc-for-component-wrapper.nix {
     inherit lib ghc haskellLib;
-    inherit (buildPackages) stdenv;
+    inherit (pkgs) stdenv;
     inherit (buildPackages.buildPackages) runCommand makeWrapper;
     inherit (buildPackages.buildPackages.xorg) lndir;
   };

builder/ghc-for-component-wrapper.nix

@@ -14,6 +14,7 @@
 , postInstall ? ""
 , enableDWARF
 , plugins
+, ghcOptions ? []
 }:
 
 let
@@ -107,7 +108,7 @@ let
           --set "NIX_${ghcCommandCaps}PKG"     "$wrappedGhc/bin/${ghcCommand}-pkg" \
           --set "NIX_${ghcCommandCaps}_DOCDIR" "${docDir}"                  \
           --set "GHC_PLUGINS"                  "$GHC_PLUGINS"               \
-          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"
+          --set "NIX_${ghcCommandCaps}_LIBDIR" "${libDir}"${lib.concatMapStrings (o: " --add-flags ${o}") ghcOptions}
       fi
     done
 
@@ -159,8 +160,7 @@ let
     inherit script targetPrefix;
     inherit (ghc) version meta;
   };
-  propagatedBuildInputs = configFiles.libDeps;
-  nativeBuildInputs = [ghc];
+  propagatedBuildInputs = configFiles.libDeps ++ [stdenv.cc ghc];
 } (''
     mkdir -p $out/configFiles
     configFiles=$out/configFiles

builder/shell-for.nix

@@ -143,6 +143,7 @@ let
     '';
     inherit enableDWARF;
     plugins = [];
+    ghcOptions =  haskell-nix.templateHaskell.${compiler.nix-name}.ghcOptions or [];
   };
 
   hoogleIndex = let
@@ -192,11 +193,16 @@ in
                 ''} $(builtin type -P "${ghcEnv.targetPrefix}pkg-config" &> /dev/null && echo "--with-pkg-config=${ghcEnv.targetPrefix}pkg-config") \
                 "$@"
               '');
+    propagatedBuildInputs = mkDrvArgs.propagateBuildInputs or [] ++ ghcEnv.drv.propagatedBuildInputs;
     phases = ["installPhase"];
     installPhase = ''
       echo "${"Shell for " + toString (builtins.map (p : p.identifier.name) selectedPackages)}"
       echo $nativeBuildInputs $buildInputs > $out
     '';
+    shellHook = mkDrvArgs.shellHook or "" + lib.optionalString stdenv.hostPlatform.isWindows ''
+
+       export pkgsHostTargetAsString="''${pkgsHostTarget[@]}"
+    '';
 
     # This helps tools like `ghcide` (that use the ghc api) to find
     # the correct global package DB.

test/th-dlls/default.nix

@@ -7,12 +7,12 @@ let
   project = externalInterpreter: project' {
     inherit compiler-nix-name evalPackages;
     src = testSrc "th-dlls";
-    cabalProjectLocal = builtins.readFile ../cabal.project.local;
     modules = import ../modules.nix ++ [({pkgs, ...}: lib.optionalAttrs externalInterpreter {
       packages.th-dlls.components.library.ghcOptions = [ "-fexternal-interpreter" ];
       # Static openssl seems to fail to load in iserv for musl
       packages.HsOpenSSL.components.library.libs = lib.optional pkgs.stdenv.hostPlatform.isMusl (pkgs.openssl.override { static = false; });
     })];
+    shell.nativeBuildInputs = [ buildPackages.haskell-nix.nix-tools-unchecked.exes.cabal ];
   };
 
   packages = (project false).hsPkgs;