diff options
| author | Peter Simons <simons@cryp.to> | 2018-07-04 13:18:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 13:18:21 +0200 |
| commit | 6e07a3a19a56b27446fb78b3213ea1d6534d1c99 (patch) | |
| tree | 5fb2a357baea42598d606f1da4c91771316393b5 /pkgs/build-support | |
| parent | 45f8c2ac29c28060d284318baf0565c13b2b131f (diff) | |
| download | nixpkgs-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar nixpkgs-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.gz nixpkgs-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.bz2 nixpkgs-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.lz nixpkgs-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.xz nixpkgs-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.tar.zst nixpkgs-6e07a3a19a56b27446fb78b3213ea1d6534d1c99.zip | |
Revert "haskell generic-builder: Use strictDeps always"
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchpatch/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchpatch/default.nix b/pkgs/build-support/fetchpatch/default.nix index 16343d626ce..c185497e691 100644 --- a/pkgs/build-support/fetchpatch/default.nix +++ b/pkgs/build-support/fetchpatch/default.nix @@ -5,7 +5,7 @@ # stripLen acts as the -p parameter when applying a patch. { lib, fetchurl, patchutils }: -{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], ... }@args: +{ stripLen ? 0, extraPrefix ? null, excludes ? [], ... }@args: fetchurl ({ postFetch = '' @@ -24,9 +24,7 @@ fetchurl ({ ${patchutils}/bin/filterdiff \ -p1 \ ${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \ - ${builtins.toString (builtins.map (x: "-i ${x}") includes)} \ "$tmpfile" > "$out" ${args.postFetch or ""} ''; - meta.broken = excludes != [] && includes != []; -} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "includes" "postFetch"]) +} // builtins.removeAttrs args ["stripLen" "extraPrefix" "excludes" "postFetch"]) |