mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 16:33:15 +00:00
wpa_supplicant_gui: Replace inkscape with imagemagick in build process.
This commit is contained in:
parent
4a1f73ab89
commit
19bdc31ed6
@ -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 = [ qmake4Hook imagemagick ];
|
||||
|
||||
nativeBuildInputs = [ inkscape qmake4Hook ];
|
||||
patches = [ ./remove_inkscape.patch ];
|
||||
prePatch = ''
|
||||
cd wpa_supplicant/wpa_gui-qt4
|
||||
'';
|
||||
|
||||
prePatch = "cd wpa_supplicant/wpa_gui-qt4";
|
||||
preConfigure = ''
|
||||
lrelease wpa_gui.pro
|
||||
'';
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
lrelease wpa_gui.pro
|
||||
'';
|
||||
postBuild = ''
|
||||
make -C icons
|
||||
'';
|
||||
|
||||
# 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
|
||||
'';
|
||||
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";
|
||||
|
Loading…
Reference in New Issue
Block a user