diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-14 18:12:09 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-08-16 11:26:18 -0400 |
commit | 220e3817b8c637b60783946003899c419aa3303b (patch) | |
tree | bc7bef6cdf2926bfe92e51de351033f175d5dff8 /pkgs/tools/misc/findutils | |
parent | eeabf85780e7fccc0289b4015b695e28ef166ab7 (diff) | |
download | nixpkgs-220e3817b8c637b60783946003899c419aa3303b.tar nixpkgs-220e3817b8c637b60783946003899c419aa3303b.tar.gz nixpkgs-220e3817b8c637b60783946003899c419aa3303b.tar.bz2 nixpkgs-220e3817b8c637b60783946003899c419aa3303b.tar.lz nixpkgs-220e3817b8c637b60783946003899c419aa3303b.tar.xz nixpkgs-220e3817b8c637b60783946003899c419aa3303b.tar.zst nixpkgs-220e3817b8c637b60783946003899c419aa3303b.zip |
findutils: Manually specify sort's location
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.
Diffstat (limited to 'pkgs/tools/misc/findutils')
-rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 06a140fed50..4eef3f7a9d5 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { 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. doCheck @@ -25,7 +25,12 @@ stdenv.mkDerivation rec { 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; |