3
0
Fork 0
forked from mirrors/nixpkgs

Modified WPA supplicant expression so that it includes an icon

svn path=/nixpkgs/trunk/; revision=15588
This commit is contained in:
Sander van der Burg 2009-05-13 10:56:53 +00:00
parent f786614e7e
commit b4d94e82cd
3 changed files with 8 additions and 3 deletions

View file

@ -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

View file

@ -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;
}

View file

@ -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"){