public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxMSW-2.8: Don't use stdenv ? cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:44:54 -04:00 committed by John Ericson
parent c4ab3ef580
commit 2f37cad1b9
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/windows/pthread-w32/default.nix
View File

@ -1,7 +1,7 @@
{ fetchurl, stdenv, mingw_headers }: { fetchurl, stdenv, mingw_headers }:
# This file is tweaked for cross-compilation only. # This file is tweaked for cross-compilation only.
assert stdenv ? cross; assert hostPlatform != buildPlatform;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pthread-w32-1.10.0"; name = "pthread-w32-1.10.0";

9
pkgs/os-specific/windows/wxMSW-2.8/default.nix
View File

@ -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 { stdenv.mkDerivation {
name = "wxMSW-2.8.11"; name = "wxMSW-2.8.11";
@ -19,12 +20,6 @@ stdenv.mkDerivation {
"--with-opengl" "--with-opengl"
]; ];
# Cross build only tested for mingw32
checkCross = throw "This package can only be cross-built" false;
crossAttrs = {
checkCross = true;
};
preConfigure = " preConfigure = "
substituteInPlace configure --replace /usr /no-such-path substituteInPlace configure --replace /usr /no-such-path
"; ";