diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-20 21:16:41 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-20 21:16:41 +0100 |
| commit | 09d02f72f6dc9201fbfce631cb1155d295350176 (patch) | |
| tree | 744337c9d11fb4f8731a91dd25e44e8be40e4909 /pkgs/tools/misc/findutils | |
| parent | 0ff2179e0ffc5aded75168cb5a13ca1821bdcd24 (diff) | |
| download | nixpkgs-09d02f72f6dc9201fbfce631cb1155d295350176.tar nixpkgs-09d02f72f6dc9201fbfce631cb1155d295350176.tar.gz nixpkgs-09d02f72f6dc9201fbfce631cb1155d295350176.tar.bz2 nixpkgs-09d02f72f6dc9201fbfce631cb1155d295350176.tar.lz nixpkgs-09d02f72f6dc9201fbfce631cb1155d295350176.tar.xz nixpkgs-09d02f72f6dc9201fbfce631cb1155d295350176.tar.zst nixpkgs-09d02f72f6dc9201fbfce631cb1155d295350176.zip | |
Re-revert "Merge: glibc: 2.24 -> 2.25"
This reverts commit 55cc7700e968001c9ac79190fbcf25ed3620680a. I hope most problems have been solved. /cc #22874.
Diffstat (limited to 'pkgs/tools/misc/findutils')
| -rw-r--r-- | pkgs/tools/misc/findutils/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 086c72bdbb2..8bedbeb12fe 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ coreutils ]; # bin/updatedb script needs to call sort - doCheck = !stdenv.isDarwin; + # Since glibc-2.25 the i686 tests hang reliably right after test-sleep. + doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux"); outputs = [ "out" "info" ]; |