public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "add patchFlags to haskell-ng's generic-builder"

Browse Source 
Oops! Didn't realize that the stripLen option can be passed to fetchpatch.
Seems a cleaner than my method

This reverts commit eb7362a36cf2be72ddcc9845249641d021424a93.
This commit is contained in:
Cray Elliott 2015-04-05 00:58:37 -07:00
parent 4c449b86ea
commit 880e0950d8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -35,7 +35,7 @@
, testTarget ? "" , testTarget ? ""
, broken ? false , broken ? false
, preUnpack ? "", postUnpack ? "" , preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "", patchFlags ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, preConfigure ? "", postConfigure ? "" , preConfigure ? "", postConfigure ? ""
, preBuild ? "", postBuild ? "" , preBuild ? "", postBuild ? ""
, preInstall ? "", postInstall ? "" , preInstall ? "", postInstall ? ""
@ -285,7 +285,6 @@ stdenv.mkDerivation ({
// optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patches != []) { inherit patches; }
// optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (patchPhase != "") { inherit patchPhase; }
// optionalAttrs (postPatch != "") { inherit postPatch; } // optionalAttrs (postPatch != "") { inherit postPatch; }
// optionalAttrs (patchFlags != "") { inherit patchFlags; }
// optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (preConfigure != "") { inherit preConfigure; }
// optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; }
// optionalAttrs (preBuild != "") { inherit preBuild; } // optionalAttrs (preBuild != "") { inherit preBuild; }