From c48dd664ffb3ec497a1af400c9c2db95c23e9879 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:52:09 +0300 Subject: jom: move to qmake4Hook --- pkgs/os-specific/windows/jom/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/os-specific/windows') 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"; -- cgit 1.4.1