public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

findutils: modernize and fix cross

Browse Source
This commit is contained in:
Ross MacLeod 2017-06-04 17:32:55 +00:00 committed by John Ericson
parent 54089620f5
commit d710c2d943
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/misc/findutils/default.nix
View File

@ -1,4 +1,9 @@
{ stdenv, fetchurl, coreutils }: { stdenv, fetchurl
, coreutils
, buildPlatform, hostPlatform
}:
let inherit (stdenv.lib) optionals; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "findutils-4.6.0"; name = "findutils-4.6.0";
@ -10,20 +15,18 @@ stdenv.mkDerivation rec {
patches = [ ./memory-leak.patch ./no-install-statedir.patch ]; patches = [ ./memory-leak.patch ./no-install-statedir.patch ];
buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort buildInputs = optionals (hostPlatform == buildPlatform) [ 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 = !stdenv.isDarwin && (stdenv.system != "i686-linux"); doCheck
= !hostPlatform.isDarwin
&& !(hostPlatform.libc == "glibc" && hostPlatform.isi686)
&& hostPlatform == buildPlatform;
outputs = [ "out" "info" ]; outputs = [ "out" "info" ];
configureFlags = [ "--localstatedir=/var/cache" ]; configureFlags = [ "--localstatedir=/var/cache" ];
crossAttrs = {
# Fix the 'buildInputs = [ coreutils ]' above - that adds the cross coreutils to PATH :(
propagatedBuildInputs = [ ];
};
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {