public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wpa_supplicant_gui: Replace inkscape with imagemagick in build process.

Browse Source
This commit is contained in:
Moritz Ulrich 2016-10-30 22:28:08 +01:00
parent 4a1f73ab89
commit 19bdc31ed6
1 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/os-specific/linux/wpa_supplicant/gui.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, qmake4Hook, inkscape, wpa_supplicant }: { stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "wpa_gui-${wpa_supplicant.version}"; name = "wpa_gui-${wpa_supplicant.version}";
@ -6,26 +6,22 @@ stdenv.mkDerivation {
inherit (wpa_supplicant) src; inherit (wpa_supplicant) src;
buildInputs = [ qt4 ]; buildInputs = [ qt4 ];
nativeBuildInputs = [ qmake4Hook imagemagick ];
nativeBuildInputs = [ inkscape qmake4Hook ]; patches = [ ./remove_inkscape.patch ];
prePatch = ''
cd wpa_supplicant/wpa_gui-qt4
'';
prePatch = "cd wpa_supplicant/wpa_gui-qt4"; preConfigure = ''
preConfigure =
''
lrelease wpa_gui.pro lrelease wpa_gui.pro
''; '';
# We do not install .xpm icons. First of all, I don't know where they should postBuild = ''
# be install. Second, this allows us to drop imagemagick build-time dependency.
postBuild =
''
sed -e '/ICONS.*xpm/d' -i icons/Makefile
make -C icons make -C icons
''; '';
installPhase = installPhase = ''
''
mkdir -pv $out/bin mkdir -pv $out/bin
cp -v wpa_gui $out/bin cp -v wpa_gui $out/bin
mkdir -pv $out/share/applications mkdir -pv $out/share/applications