diff options
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bc43c39676c..bf1f2c387ad 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -338,9 +338,10 @@ stdenv.mkDerivation ({ echo "Build with ${ghc}." ${optionalString (isLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"} - setupPackageConfDir="$TMPDIR/setup-package.conf.d" + builddir="$(mktemp -d)" + setupPackageConfDir="$builddir/setup-package.conf.d" mkdir -p $setupPackageConfDir - packageConfDir="$TMPDIR/package.conf.d" + packageConfDir="$builddir/package.conf.d" mkdir -p $packageConfDir setupCompileFlags="${concatStringsSep " " setupCompileFlags}" @@ -418,7 +419,7 @@ stdenv.mkDerivation ({ done echo setupCompileFlags: $setupCompileFlags - ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i + ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $builddir -hidir $builddir $i runHook postCompileBuildDriver ''; @@ -469,7 +470,10 @@ stdenv.mkDerivation ({ # `--test-option`, so Cabal passes it to the underlying test suite binary. checkPhase = '' runHook preCheck - checkFlagsArray+=(${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)}) + checkFlagsArray+=( + "--show-details=streaming" + ${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)} + ) ${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"} runHook postCheck ''; |