ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

jom: move to qmake4Hook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:52:09 +03:00
parent e282d36143
commit c48dd664ff
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/os-specific/windows/jom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, qt48, flex, cmake }: { stdenv, fetchgit, qt48, qmake4Hook, flex }:
# At the time of committing this, the expression fails for me to cross-build in # At the time of committing this, the expression fails for me to cross-build in
# both mingw32 and mingw64. # both mingw32 and mingw64.
@ -13,12 +13,9 @@ stdenv.mkDerivation {
}; };
buildInputs = [ qt48 ]; buildInputs = [ qt48 ];
nativeBuildInputs = [ flex /*cmake*/ ]; nativeBuildInputs = [ flex qmake4Hook ];
QTDIR = qt48; QTDIR = qt48;
configurePhase = ''
qmake PREFIX=$out
'';
crossAttrs = { 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.cross.config}-windres";