From 95f6bece881174561a5684bf6f66cd30b63ccdba Mon Sep 17 00:00:00 2001
From: Jörg Thalheim <joerg@thalheim.io>
Date: Mon, 1 May 2017 20:55:20 +0200
Subject: wpa_supplicant: upgrade to qt5

also inkscape removal patch, as it introduced a bug: #25320
fixes #25320 #25325
---
 pkgs/os-specific/linux/wpa_supplicant/gui.nix      | 17 ++++--------
 .../linux/wpa_supplicant/remove_inkscape.patch     | 30 ----------------------
 2 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch

(limited to 'pkgs/os-specific/linux/wpa_supplicant')

diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index 89f40589c87..d2bd6ff739f 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -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
   '';
 
diff --git a/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch b/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch
deleted file mode 100644
index 1bdb164e24f..00000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7a42ef048b420f9b939085ea8c6af6deb9c19dac Mon Sep 17 00:00:00 2001
-From: Moritz Ulrich <moritz@tarn-vedra.de>
-Date: Sun, 30 Oct 2016 22:17:54 +0100
-Subject: [PATCH] Foo
-
----
- icons/Makefile | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/icons/Makefile b/icons/Makefile
-index 709514c..9a5fa94 100644
---- a/icons/Makefile
-+++ b/icons/Makefile
-@@ -9,10 +9,9 @@ all: $(ICONS)
- 
- %.png:
- 	mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/
--	inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \
--		--export-width=$(word 1, $(subst x, , $(@)))  \
--	        --export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \
--		--export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
-+	convert $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) \
-+		-size $(word 1, $(subst x, , $(@)))x$(word 2, $(subst x, , $(subst /, , $(@)))) \
-+		hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
- 
- %.xpm:
- 	mkdir -p pixmaps/
--- 
-2.10.1
-
-- 
cgit 1.4.1