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

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

Browse Source
This commit is contained in:
John Ericson
2017-12-29 15:28:56 -05:00
parent 5d336d36bb 3afe325a3e
commit bc3a6e260a
1286 changed files with 31659 additions and 79981 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.cc.prefix}windres";
# cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cc.targetPrefix}windres";
QTDIR = qt48.crossDrv;
preBuild = ''
export NIX_CROSS_CFLAGS_COMPILE=-fpermissive