diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 15:28:56 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 15:28:56 -0500 |
| commit | bc3a6e260a9fc9924f86c36fc522a996df5d3e26 (patch) | |
| tree | 21f852d980f96e4e89e4402b5bed5e9eea7b4db4 /pkgs/os-specific/windows | |
| parent | 5d336d36bb0cb20d8966e9e426f8621629ac6e03 (diff) | |
| parent | 3afe325a3e2f906ba512fb7a2f28f79496711592 (diff) | |
| download | nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.gz nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.bz2 nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.lz nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.xz nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.zst nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.zip | |
Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/jom/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index b2b23f200455..8befa51566de 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.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 |