wpa_supplicant: upgrade to qt5

also inkscape removal patch, as it introduced a bug: #25320
fixes #25320 #25325
This commit is contained in:
Jörg Thalheim
2017-05-01 21:23:22 +02:00
parent cb9f60ba8f
commit 95f6bece88
3 changed files with 6 additions and 43 deletions
+5 -12
View File
@@ -1,32 +1,25 @@
{ stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }:
{ stdenv, fetchurl, qtbase, qmakeHook, inkscape, imagemagick, wpa_supplicant }:
stdenv.mkDerivation {
name = "wpa_gui-${wpa_supplicant.version}";
inherit (wpa_supplicant) src;
buildInputs = [ qt4 ];
nativeBuildInputs = [ qmake4Hook imagemagick ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmakeHook inkscape imagemagick ];
patches = [ ./remove_inkscape.patch ];
prePatch = ''
cd wpa_supplicant/wpa_gui-qt4
'';
preConfigure = ''
lrelease wpa_gui.pro
'';
postBuild = ''
make -C icons
'';
installPhase = ''
mkdir -pv $out/bin
postInstall = ''
mkdir -pv $out/{bin,share/applications,share/icons}
cp -v wpa_gui $out/bin
mkdir -pv $out/share/applications
cp -v wpa_gui.desktop $out/share/applications
mkdir -pv $out/share/icons
cp -av icons/hicolor $out/share/icons
'';