fetchpatch: add excludes parameter

This commit is contained in:
Robin Gloster 2017-07-26 12:59:02 +02:00
parent 1ec5b7f1d3
commit 100107a3cd

View File

@ -5,7 +5,7 @@
# stripLen acts as the -p parameter when applying a patch. # stripLen acts as the -p parameter when applying a patch.
{ lib, fetchurl, patchutils }: { lib, fetchurl, patchutils }:
{ stripLen ? 0, addPrefixes ? false, ... }@args: { stripLen ? 0, addPrefixes ? false, excludes ? [], ... }@args:
fetchurl ({ fetchurl ({
postFetch = '' postFetch = ''
@ -21,7 +21,10 @@ fetchurl ({
--addnewprefix=b/ \ --addnewprefix=b/ \
''} \ ''} \
--clean "$out" > "$tmpfile" --clean "$out" > "$tmpfile"
mv "$tmpfile" "$out" ${patchutils}/bin/filterdiff \
-p1 \
${builtins.toString (builtins.map (x: "-x ${x}") excludes)} \
"$tmpfile" > "$out"
${args.postFetch or ""} ${args.postFetch or ""}
''; '';
} // builtins.removeAttrs args ["stripLen" "addPrefixes"]) } // builtins.removeAttrs args ["stripLen" "addPrefixes" "excludes"])