diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:44:54 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 21:29:07 -0400 |
| commit | 2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f (patch) | |
| tree | 6a3756b8acd885cd0e36cb8f350bf8a70ecb4fd5 /pkgs/os-specific/windows | |
| parent | c4ab3ef580704a00e2de00180de089043da2e0e2 (diff) | |
| download | nixlib-2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f.tar nixlib-2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f.tar.gz nixlib-2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f.tar.bz2 nixlib-2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f.tar.lz nixlib-2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f.tar.xz nixlib-2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f.tar.zst nixlib-2f37cad1b976ceec47d92dc1e3bc9456cf49ea1f.zip | |
wxMSW-2.8: Don't use stdenv ? cross
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/pthread-w32/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/windows/wxMSW-2.8/default.nix | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix index dde4f5d73711..f0b6852d5bf9 100644 --- a/pkgs/os-specific/windows/pthread-w32/default.nix +++ b/pkgs/os-specific/windows/pthread-w32/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, mingw_headers }: # This file is tweaked for cross-compilation only. -assert stdenv ? cross; +assert hostPlatform != buildPlatform; stdenv.mkDerivation { name = "pthread-w32-1.10.0"; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 5c79460060ad..6c52ce1e6f38 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, compat24 ? false, compat26 ? true, unicode ? true, +, hostPlatform }: -assert stdenv ? cross -> stdenv.cross.libc == "msvcrt"; +assert hostPlatform.isWindows; stdenv.mkDerivation { name = "wxMSW-2.8.11"; @@ -19,12 +20,6 @@ stdenv.mkDerivation { "--with-opengl" ]; - # Cross build only tested for mingw32 - checkCross = throw "This package can only be cross-built" false; - crossAttrs = { - checkCross = true; - }; - preConfigure = " substituteInPlace configure --replace /usr /no-such-path "; |