diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-14 13:22:00 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-14 13:22:00 -0700 |
| commit | a106080623d9806da90aeb73951e0773b8bca9af (patch) | |
| tree | 3af7ca809c29e124de8b8ecd17f42eb86643e2ee /pkgs/development/haskell-modules/generic-builder.nix | |
| parent | e46e461685e048ac975dfb5fedac34d6c03a5423 (diff) | |
| parent | c541c236927b9ec20901cf0b7a58b622b41abe8b (diff) | |
| download | nixlib-a106080623d9806da90aeb73951e0773b8bca9af.tar nixlib-a106080623d9806da90aeb73951e0773b8bca9af.tar.gz nixlib-a106080623d9806da90aeb73951e0773b8bca9af.tar.bz2 nixlib-a106080623d9806da90aeb73951e0773b8bca9af.tar.lz nixlib-a106080623d9806da90aeb73951e0773b8bca9af.tar.xz nixlib-a106080623d9806da90aeb73951e0773b8bca9af.tar.zst nixlib-a106080623d9806da90aeb73951e0773b8bca9af.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/development/haskell-modules/generic-builder.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 6378f4c1e635..95f58b7322dc 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -39,7 +39,7 @@ , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , preConfigure ? "", postConfigure ? "" , preBuild ? "", postBuild ? "" -, preInstall ? "", postInstall ? "" +, installPhase ? "", preInstall ? "", postInstall ? "" , checkPhase ? "", preCheck ? "", postCheck ? "" , preFixup ? "", postFixup ? "" , coreSetup ? false # Use only core packages to build Setup.hs. @@ -307,6 +307,7 @@ stdenv.mkDerivation ({ // optionalAttrs (preCheck != "") { inherit preCheck; } // optionalAttrs (postCheck != "") { inherit postCheck; } // optionalAttrs (preInstall != "") { inherit preInstall; } +// optionalAttrs (installPhase != "") { inherit installPhase; } // optionalAttrs (postInstall != "") { inherit postInstall; } // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } |