From 19bdc31ed6a231f8ba40e89ff3d627ae711ea7dc Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 30 Oct 2016 22:28:08 +0100
Subject: wpa_supplicant_gui: Replace inkscape with imagemagick in build
 process.

---
 pkgs/os-specific/linux/wpa_supplicant/gui.nix | 52 +++++++++++++--------------
 1 file changed, 24 insertions(+), 28 deletions(-)

(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 a75367f0bb0..89f40589c87 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, qmake4Hook, inkscape, wpa_supplicant }:
+{ stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }:
 
 stdenv.mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
@@ -6,33 +6,29 @@ stdenv.mkDerivation {
   inherit (wpa_supplicant) src;
 
   buildInputs = [ qt4 ];
-
-  nativeBuildInputs = [ inkscape qmake4Hook ];
-
-  prePatch = "cd wpa_supplicant/wpa_gui-qt4";
-
-  preConfigure =
-    ''
-      lrelease wpa_gui.pro
-    '';
-
-  # We do not install .xpm icons. First of all, I don't know where they should
-  # be install. Second, this allows us to drop imagemagick build-time dependency.
-  postBuild =
-    ''
-      sed -e '/ICONS.*xpm/d' -i icons/Makefile
-      make -C icons
-    '';
-
-  installPhase =
-    ''
-      mkdir -pv $out/bin
-      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
-    '';
+  nativeBuildInputs = [ qmake4Hook 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
+    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
+  '';
 
   meta = {
     description = "Qt-based GUI for wpa_supplicant";
-- 
cgit 1.4.1