diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2015-04-05 00:58:37 -0700 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2015-04-05 01:06:20 -0700 |
| commit | 880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2 (patch) | |
| tree | fbc8a0cd9e2cc0e2ec73eab3e5fb7c745abff8c2 /pkgs | |
| parent | 4c449b86ea009e591ae91aad3d16359b0735cec0 (diff) | |
| download | nixlib-880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2.tar nixlib-880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2.tar.gz nixlib-880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2.tar.bz2 nixlib-880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2.tar.lz nixlib-880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2.tar.xz nixlib-880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2.tar.zst nixlib-880e0950d8b6a5e6ff50df5feb04f0bcfab9eaf2.zip | |
Revert "add patchFlags to haskell-ng's generic-builder"
Oops! Didn't realize that the stripLen option can be passed to fetchpatch. Seems a cleaner than my method This reverts commit eb7362a36cf2be72ddcc9845249641d021424a93.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 9819dba53982..baefedf5a74d 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -35,7 +35,7 @@ , testTarget ? "" , broken ? false , preUnpack ? "", postUnpack ? "" -, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "", patchFlags ? "" +, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , preConfigure ? "", postConfigure ? "" , preBuild ? "", postBuild ? "" , preInstall ? "", postInstall ? "" @@ -285,7 +285,6 @@ stdenv.mkDerivation ({ // optionalAttrs (patches != []) { inherit patches; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (postPatch != "") { inherit postPatch; } -// optionalAttrs (patchFlags != "") { inherit patchFlags; } // optionalAttrs (preConfigure != "") { inherit preConfigure; } // optionalAttrs (postConfigure != "") { inherit postConfigure; } // optionalAttrs (preBuild != "") { inherit preBuild; } |