diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-16 11:27:44 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-16 11:54:34 -0400 |
| commit | 63428ebab97e917cbd5820215c49ead6fb91e7d3 (patch) | |
| tree | b3ed533a4cb5dd15bd8396edf0f3e3d3d5aef9d7 /pkgs/tools/text/diffutils | |
| parent | 220e3817b8c637b60783946003899c419aa3303b (diff) | |
| download | nixlib-63428ebab97e917cbd5820215c49ead6fb91e7d3.tar nixlib-63428ebab97e917cbd5820215c49ead6fb91e7d3.tar.gz nixlib-63428ebab97e917cbd5820215c49ead6fb91e7d3.tar.bz2 nixlib-63428ebab97e917cbd5820215c49ead6fb91e7d3.tar.lz nixlib-63428ebab97e917cbd5820215c49ead6fb91e7d3.tar.xz nixlib-63428ebab97e917cbd5820215c49ead6fb91e7d3.tar.zst nixlib-63428ebab97e917cbd5820215c49ead6fb91e7d3.zip | |
diffutils: coreutils is a run-time dep; specify pr's location
Diffstat (limited to 'pkgs/tools/text/diffutils')
| -rw-r--r-- | pkgs/tools/text/diffutils/default.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 787750c8ecf3..cd64bd1566b5 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -10,8 +10,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" ]; + nativeBuildInputs = [ xz.bin ]; /* If no explicit coreutils is given, use the one from stdenv. */ - nativeBuildInputs = [ xz.bin coreutils ]; + buildInputs = [ coreutils ]; + + configureFlags = + # "pr" need not be on the PATH as a run-time dep, so we need to tell + # configure where it is. Covers the cross and native case alike. + stdenv.lib.optional (coreutils != null) "PR_PROGRAM=${coreutils}/bin/pr"; meta = { homepage = http://www.gnu.org/software/diffutils/diffutils.html; |