From 38157e88d8d2bc4bcd74642e8a3e15874b1d6225 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 15 Jul 2018 16:24:47 +0800 Subject: [PATCH 1/3] [cc-wrapper] no coreutils on with mingw --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index aca96f58ed97d..ed8d41be806a6 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -40,7 +40,7 @@ let libc_lib = if libc == null then null else getLib libc; cc_solib = getLib cc; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. - coreutils_bin = if nativeTools then "" else getBin coreutils; + coreutils_bin = if (nativeTools || targetPlatform.isWindows) then "" else getBin coreutils; default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc) "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)"; From 84438783f2b004b0dc04f79b1605fe290335cb37 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 15 Jul 2018 16:27:44 +0800 Subject: [PATCH 2/3] [coreutils] assert not msvcrt. --- pkgs/tools/misc/coreutils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 589c58d0acc02..b13ba656a8a91 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -10,6 +10,7 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; +assert hostPlatform.libc != "msvcrt"; with lib; From d9e9af25c5b32671aab604f52649f6219be46c83 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Wed, 18 Jul 2018 12:03:20 +0800 Subject: [PATCH 3/3] Update default.nix --- pkgs/tools/misc/coreutils/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b13ba656a8a91..69d751a629eaf 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -10,7 +10,6 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; -assert hostPlatform.libc != "msvcrt"; with lib; @@ -101,7 +100,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - platforms = platforms.all; + platforms = platforms.unix; maintainers = [ maintainers.eelco ]; };