diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-04-17 02:52:09 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-04-20 18:55:55 +0300 |
| commit | c48dd664ffb3ec497a1af400c9c2db95c23e9879 (patch) | |
| tree | 575b7e1053570b731add98ed829bee7c6985e3da /pkgs/os-specific/windows | |
| parent | e282d36143ea73756da19917fba53614118cc1fd (diff) | |
| download | nixpkgs-c48dd664ffb3ec497a1af400c9c2db95c23e9879.tar nixpkgs-c48dd664ffb3ec497a1af400c9c2db95c23e9879.tar.gz nixpkgs-c48dd664ffb3ec497a1af400c9c2db95c23e9879.tar.bz2 nixpkgs-c48dd664ffb3ec497a1af400c9c2db95c23e9879.tar.lz nixpkgs-c48dd664ffb3ec497a1af400c9c2db95c23e9879.tar.xz nixpkgs-c48dd664ffb3ec497a1af400c9c2db95c23e9879.tar.zst nixpkgs-c48dd664ffb3ec497a1af400c9c2db95c23e9879.zip | |
jom: move to qmake4Hook
Diffstat (limited to 'pkgs/os-specific/windows')
| -rw-r--r-- | pkgs/os-specific/windows/jom/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 4b118a5a7cd..6537503add8 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -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 # both mingw32 and mingw64. @@ -13,12 +13,9 @@ stdenv.mkDerivation { }; buildInputs = [ qt48 ]; - nativeBuildInputs = [ flex /*cmake*/ ]; + nativeBuildInputs = [ flex qmake4Hook ]; QTDIR = qt48; - configurePhase = '' - qmake PREFIX=$out - ''; crossAttrs = { # cmakeFlags = "-DWIN32=1 -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_RC_COMPILER=${stdenv.cross.config}-windres"; |