summary refs log tree commit diff
path: root/pkgs/os-specific/linux/wpa_supplicant
diff options
context:
space:
mode:
authorSander van der Burg <s.vanderburg@tudelft.nl>2009-05-13 10:56:53 +0000
committerSander van der Burg <s.vanderburg@tudelft.nl>2009-05-13 10:56:53 +0000
commitb4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee (patch)
tree8d1fdc738c6277d7bb3bc7aa54e723cf62965eca /pkgs/os-specific/linux/wpa_supplicant
parentf786614e7e2e46e7893ec18a0684ca4815ac014d (diff)
downloadnixlib-b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee.tar
nixlib-b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee.tar.gz
nixlib-b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee.tar.bz2
nixlib-b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee.tar.lz
nixlib-b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee.tar.xz
nixlib-b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee.tar.zst
nixlib-b4d94e82cd7154d1f6ad826b47c6c0cacdd8cfee.zip
Modified WPA supplicant expression so that it includes an icon
svn path=/nixpkgs/trunk/; revision=15588
Diffstat (limited to 'pkgs/os-specific/linux/wpa_supplicant')
-rw-r--r--pkgs/os-specific/linux/wpa_supplicant/builder-gui-qt4.sh5
-rw-r--r--pkgs/os-specific/linux/wpa_supplicant/gui-qt4.nix4
2 files changed, 7 insertions, 2 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 36d2e1498c64..728b5837b168 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 5901e4379833..7b587cdd6230 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;  
 }