diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2018-05-21 17:43:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-21 17:43:30 -0400 |
| commit | d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6 (patch) | |
| tree | b5bf39b1235cb169ff8625d01ea2d5db1bceca05 /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 4b480942851d72bc6f292539b1e9a0c100323fae (diff) | |
| parent | 99c1d03096988e4f4d48414f0a4ecd561c41b217 (diff) | |
| download | nixlib-d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6.tar nixlib-d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6.tar.gz nixlib-d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6.tar.bz2 nixlib-d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6.tar.lz nixlib-d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6.tar.xz nixlib-d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6.tar.zst nixlib-d6ecbbe9212fe31c5774c9b1709fedeaa7a0e6f6.zip | |
Merge branch 'staging' into feature/clean-ghc
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 99c85ac688a5..5054106959f7 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -21,7 +21,7 @@ in , configureFlags ? [] , buildFlags ? [] , description ? "" -, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version) +, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true , editedCabalFile ? null @@ -180,7 +180,7 @@ let buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ - optionals (allPkgconfigDepends != []) allPkgconfigDepends ++ + allPkgconfigDepends ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends); @@ -352,6 +352,8 @@ stdenv.mkDerivation ({ runHook postBuild ''; + inherit doCheck; + checkPhase = '' runHook preCheck ${setupCommand} test ${testTarget} @@ -466,7 +468,6 @@ stdenv.mkDerivation ({ // optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (preBuild != "") { inherit preBuild; } // optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (doCheck) { inherit doCheck; } // optionalAttrs (doBenchmark) { inherit doBenchmark; } // optionalAttrs (checkPhase != "") { inherit checkPhase; } // optionalAttrs (preCheck != "") { inherit preCheck; } |