From b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 13 May 2009 10:56:53 +0000
Subject: [PATCH] Modified WPA supplicant expression so that it includes an
 icon

svn path=/nixpkgs/trunk/; revision=15588
---
 pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh | 5 +++++
 pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix        | 4 ++--
 pkgs/top-level/all-packages.nix                          | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh b/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh
index 36d2e1498c6..728b5837b16 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh
+++ b/pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh
@@ -6,6 +6,11 @@ cp defconfig .config
 substituteInPlace Makefile --replace /usr/local $out
 make wpa_gui-qt4
 cd wpa_gui-qt4
+cd icons
+make
+ensureDir $out/share/icons
+cp -av hicolor $out/share/icons
+cd ..
 ensureDir $out/bin
 cp wpa_gui $out/bin
 ensureDir $out/share/applications
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
index 5901e437983..7b587cdd623 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4}:
+{stdenv, fetchurl, qt4, imagemagick, inkscape}:
 
 stdenv.mkDerivation rec {
   pkgname = "wpa_supplicant";
@@ -10,6 +10,6 @@ stdenv.mkDerivation rec {
     sha256 = "0w7mf3nyilkjsn5v7p15v5fxnh0klgm8c979z80y0mkw7zx88lkf";
   };
 
-  buildInputs = [qt4];  
+  buildInputs = [qt4 imagemagick inkscape];
   builder = ./builder-gui-qt4.sh;  
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 797a4692425..e2d1abb3219 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5407,7 +5407,7 @@ let
   };
 
   wpa_supplicant_gui_qt4 = import ../os-specific/linux/wpa_supplicant/gui-qt4.nix {
-    inherit fetchurl stdenv qt4;
+    inherit fetchurl stdenv qt4 imagemagick inkscape;
   };
 
   xfsProgs = builderDefsPackage (selectVersion ../os-specific/linux/xfsprogs "2.9.7-1"){