pyrox.dev
fetchpatch: patchutils -> buildPackages.patchutils
authored by volth and committed by John Ericson caf2cae4 60970294
+5
-5
pkgs/build-support/fetchpatch/default.nix
+5
-5
pkgs/build-support/fetchpatch/default.nix
···
4
4
# often change with updating of git or cgit.
5
5
# stripLen acts as the -p parameter when applying a patch.
6
6
7
-
{ lib, fetchurl, patchutils }:
7
+
{ lib, fetchurl, buildPackages }:
8
8
{ stripLen ? 0, extraPrefix ? null, excludes ? [], includes ? [], revert ? false, ... }@args:
9
9
10
10
fetchurl ({
···
14
14
echo "error: Fetched patch file '$out' is empty!" 1>&2
15
15
exit 1
16
16
fi
17
-
"${patchutils}/bin/lsdiff" "$out" \
17
+
"${buildPackages.patchutils}/bin/lsdiff" "$out" \
18
18
| sort -u | sed -e 's/[*?]/\\&/g' \
19
19
| xargs -I{} \
20
-
"${patchutils}/bin/filterdiff" \
20
+
"${buildPackages.patchutils}/bin/filterdiff" \
21
21
--include={} \
22
22
--strip=${toString stripLen} \
23
23
${lib.optionalString (extraPrefix != null) ''
···
32
32
cat "$out" 1>&2
33
33
exit 1
34
34
fi
35
-
${patchutils}/bin/filterdiff \
35
+
${buildPackages.patchutils}/bin/filterdiff \
36
36
-p1 \
37
37
${builtins.toString (builtins.map (x: "-x ${lib.escapeShellArg x}") excludes)} \
38
38
${builtins.toString (builtins.map (x: "-i ${lib.escapeShellArg x}") includes)} \
···
46
46
exit 1
47
47
fi
48
48
'' + lib.optionalString revert ''
49
-
${patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
49
+
${buildPackages.patchutils}/bin/interdiff "$out" /dev/null > "$tmpfile"
50
50
mv "$tmpfile" "$out"
51
51
'' + (args.postFetch or "");
52
52
meta.broken = excludes != [] && includes != [];