From 63428ebab97e917cbd5820215c49ead6fb91e7d3 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 16 Aug 2017 11:27:44 -0400 Subject: diffutils: coreutils is a run-time dep; specify pr's location --- pkgs/tools/text/diffutils/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/text/diffutils') 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; -- cgit 1.4.1