diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-03-09 16:37:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 16:37:40 +0100 |
| commit | f9cce2eb3630550e21d961a1c8f4547a0c4e852a (patch) | |
| tree | 7e320fe66e7aa7718e7fce67530f4b61eeabde63 /pkgs/tools | |
| parent | 748f02792a0c6e53766d23ce56e2a13676c6b052 (diff) | |
| parent | ad443d500abb7acb032217b570aa125738c52b36 (diff) | |
| download | nixlib-f9cce2eb3630550e21d961a1c8f4547a0c4e852a.tar nixlib-f9cce2eb3630550e21d961a1c8f4547a0c4e852a.tar.gz nixlib-f9cce2eb3630550e21d961a1c8f4547a0c4e852a.tar.bz2 nixlib-f9cce2eb3630550e21d961a1c8f4547a0c4e852a.tar.lz nixlib-f9cce2eb3630550e21d961a1c8f4547a0c4e852a.tar.xz nixlib-f9cce2eb3630550e21d961a1c8f4547a0c4e852a.tar.zst nixlib-f9cce2eb3630550e21d961a1c8f4547a0c4e852a.zip | |
Merge pull request #163460 from Artturin/colordiffdiffutils
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/text/colordiff/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 9d56e2e4c192..a7e8293851b9 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto }: +{ lib, stdenv, fetchFromGitHub, docbook_xml_dtd_412, docbook_xsl, perl, w3m, xmlto, diffutils }: stdenv.mkDerivation rec { pname = "colordiff"; @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ --replace 'TMPDIR=colordiff-''${VERSION}' "" + + substituteInPlace colordiff.pl \ + --replace '= "diff";' '= "${diffutils}/bin/diff";' ''; installFlags = [ |