From e282d36143ea73756da19917fba53614118cc1fd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 17 Apr 2016 02:51:59 +0300 Subject: [PATCH] wpa_supplicant_gui: move to qmake4Hook --- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index 59a3c51c4d6..a75367f0bb0 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, inkscape, wpa_supplicant }: +{ stdenv, fetchurl, qt4, qmake4Hook, inkscape, wpa_supplicant }: stdenv.mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; @@ -7,14 +7,13 @@ stdenv.mkDerivation { buildInputs = [ qt4 ]; - nativeBuildInputs = [ inkscape ]; + nativeBuildInputs = [ inkscape qmake4Hook ]; prePatch = "cd wpa_supplicant/wpa_gui-qt4"; - configurePhase = + preConfigure = '' lrelease wpa_gui.pro - qmake ''; # We do not install .xpm icons. First of all, I don't know where they should