diff options
| author | Peter Simons <simons@cryp.to> | 2015-01-20 15:48:51 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-01-20 16:17:14 +0100 |
| commit | 9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7 (patch) | |
| tree | c17c591143f7561ff0dc78f6393f3f5cca77e05b /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | 0c2271c579fed4c56177036ad26678d4b183d716 (diff) | |
| download | nixlib-9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7.tar nixlib-9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7.tar.gz nixlib-9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7.tar.bz2 nixlib-9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7.tar.lz nixlib-9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7.tar.xz nixlib-9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7.tar.zst nixlib-9ab8a12b060ebf7ae6482c6354ee7759b3ee88e7.zip | |
haskell-generic-builder: re-enable the checkPhase that was accidentally broken in the earlier re-factoring
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index db14869ad49e..b6fde0a303c4 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -287,11 +287,12 @@ stdenv.mkDerivation ({ // optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (preBuild != "") { inherit preBuild; } // optionalAttrs (postBuild != "") { inherit postBuild; } -// optionalAttrs (preInstall != "") { inherit preInstall; } -// optionalAttrs (postInstall != "") { inherit postInstall; } +// optionalAttrs (doCheck) { inherit doCheck; } // optionalAttrs (checkPhase != "") { inherit checkPhase; } // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } +// optionalAttrs (preInstall != "") { inherit preInstall; } +// optionalAttrs (postInstall != "") { inherit postInstall; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } ) |