diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-07 02:19:04 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-07 02:19:04 -0500 |
| commit | 3afe325a3e2f906ba512fb7a2f28f79496711592 (patch) | |
| tree | dccc4ee2957953e809d2a5ef55d3f19061b92775 /pkgs/os-specific/windows | |
| parent | e82bd498d1a2a28fb20249569a6f49fcaab9aca8 (diff) | |
| parent | 43d5c5d6db3ce33f3cf1d17ba43c7374257466ec (diff) | |
Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder
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 |