alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

findutils: Manually specify sort's location

Browse source 
Run-time deps aren't necessarily on the PATH, so we cannot rely on
configure finding it.

N.B. on cross `-z` support is assumed missing, which is an incorrect
assumption.
This commit is contained in:
John Ericson 2017-08-14 18:12:09 -04:00
parent eeabf85780
commit 220e3817b8
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/misc/findutils/default.nix
View file

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
patches = [ ./memory-leak.patch ./no-install-statedir.patch ]; patches = [ ./memory-leak.patch ./no-install-statedir.patch ];
buildInputs = optionals (hostPlatform == buildPlatform) [ coreutils ]; # bin/updatedb script needs to call sort buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort
# Since glibc-2.25 the i686 tests hang reliably right after test-sleep. # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
doCheck doCheck
@ -25,7 +25,12 @@ stdenv.mkDerivation rec {
outputs = [ "out" "info" ]; outputs = [ "out" "info" ];
configureFlags = [ "--localstatedir=/var/cache" ]; configureFlags = [
# "sort" 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.
"SORT=${coreutils}/bin/sort"
"--localstatedir=/var/cache"
];
enableParallelBuilding = true; enableParallelBuilding = true;