diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-26 09:30:32 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-26 09:30:32 +0100 |
commit | e45ca47f145a428b146907d4a1fbdb61adf72053 (patch) | |
tree | 797964c9bca7ccdb8943fda1362a36fe9c05f322 /pkgs/tools/misc/coreutils | |
parent | e5271b72cc80539f2c57404541cb186ccd2cd507 (diff) | |
parent | 0a1dc96ada214bb61ee867030b3bd9797f57b356 (diff) | |
download | nixpkgs-e45ca47f145a428b146907d4a1fbdb61adf72053.tar nixpkgs-e45ca47f145a428b146907d4a1fbdb61adf72053.tar.gz nixpkgs-e45ca47f145a428b146907d4a1fbdb61adf72053.tar.bz2 nixpkgs-e45ca47f145a428b146907d4a1fbdb61adf72053.tar.lz nixpkgs-e45ca47f145a428b146907d4a1fbdb61adf72053.tar.xz nixpkgs-e45ca47f145a428b146907d4a1fbdb61adf72053.tar.zst nixpkgs-e45ca47f145a428b146907d4a1fbdb61adf72053.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/misc/coreutils')
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 70f72513795..3a348650308 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -74,8 +74,8 @@ stdenv.mkDerivation rec { ++ optional (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc != "glibc") libiconv; # The tests are known broken on Cygwin - # (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), - # Darwin (http://thread.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), + # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), + # Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351), # and {Open,Free}BSD. # With non-standard storeDir: https://github.com/NixOS/nix/issues/512 doCheck = stdenv.hostPlatform == stdenv.buildPlatform |