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

Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fix

Browse Source
This commit is contained in:
John Ericson
2017-12-29 14:24:10 -05:00
parent 2e0ebc0532 3a59cd87f2
commit 169227bfd2
3957 changed files with 75662 additions and 53190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/windows/jom/default.nix
+1 -1
View File
@@ -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
pkgs/os-specific/windows/pthread-w32/default.nix
+1 -1
View File
@@ -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";
pkgs/os-specific/windows/wxMSW-2.8/default.nix
+3 -8
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 {
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
";