diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 14:24:10 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 14:24:10 -0500 |
| commit | 169227bfd248f1bc4175e62d2e3d77658f9b0738 (patch) | |
| tree | c390021c34c5fedfd9770129e1eac2b0e5989726 /pkgs/os-specific/windows | |
| parent | 2e0ebc0532f89e4073cbea3f0ef1074a7a21dd8a (diff) | |
| parent | 3a59cd87f26cc59c91fb821749b1ec0d64922f87 (diff) | |
| download | nixlib-169227bfd248f1bc4175e62d2e3d77658f9b0738.tar nixlib-169227bfd248f1bc4175e62d2e3d77658f9b0738.tar.gz nixlib-169227bfd248f1bc4175e62d2e3d77658f9b0738.tar.bz2 nixlib-169227bfd248f1bc4175e62d2e3d77658f9b0738.tar.lz nixlib-169227bfd248f1bc4175e62d2e3d77658f9b0738.tar.xz nixlib-169227bfd248f1bc4175e62d2e3d77658f9b0738.tar.zst nixlib-169227bfd248f1bc4175e62d2e3d77658f9b0738.zip | |
Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/jom/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/windows/pthread-w32/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/windows/wxMSW-2.8/default.nix | 11 |
3 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 6537503add8f..b2b23f200455 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { QTDIR = qt48; crossAttrs = { - # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres"; + # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.prefix}windres"; QTDIR = qt48.crossDrv; preBuild = '' export NIX_CROSS_CFLAGS_COMPILE=-fpermissive 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..8770140cc633 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, +{ 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 "; |