wpa_supplicant: upgrade to qt5
also inkscape removal patch, as it introduced a bug: #25320 fixes #25320 #25325
This commit is contained in:
@@ -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
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user