mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

wpa_supplicant: upgrade to qt5

Browse source 
also inkscape removal patch, as it introduced a bug: #25320
fixes #25320 #25325
This commit is contained in:
Jörg Thalheim 2017-05-01 20:55:20 +02:00
parent cb9f60ba8f
commit 95f6bece88
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
3 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/os-specific/linux/wpa_supplicant/gui.nix
View file

@ -1,32 +1,25 @@
{ stdenv, fetchurl, qt4, qmake4Hook, imagemagick, wpa_supplicant }:
{ stdenv, fetchurl, qtbase, qmakeHook, inkscape, imagemagick, wpa_supplicant }:
stdenv.mkDerivation {
name = "wpa_gui-${wpa_supplicant.version}";
inherit (wpa_supplicant) src;
buildInputs = [ qt4 ];
nativeBuildInputs = [ qmake4Hook imagemagick ];
buildInputs = [ qtbase ];
nativeBuildInputs = [ qmakeHook inkscape imagemagick ];
patches = [ ./remove_inkscape.patch ];
prePatch = ''
cd wpa_supplicant/wpa_gui-qt4
'';
preConfigure = ''
lrelease wpa_gui.pro
'';
postBuild = ''
make -C icons
'';
installPhase = ''
mkdir -pv $out/bin
postInstall = ''
mkdir -pv $out/{bin,share/applications,share/icons}
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
'';

30
pkgs/os-specific/linux/wpa_supplicant/remove_inkscape.patch
View file

@ -1,30 +0,0 @@
From 7a42ef048b420f9b939085ea8c6af6deb9c19dac Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sun, 30 Oct 2016 22:17:54 +0100
Subject: [PATCH] Foo
---
icons/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/icons/Makefile b/icons/Makefile
index 709514c..9a5fa94 100644
--- a/icons/Makefile
+++ b/icons/Makefile
@@ -9,10 +9,9 @@ all: $(ICONS)
%.png:
mkdir -p hicolor/$(word 1, $(subst /, ,$(@)))/apps/
- inkscape $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) --without-gui \
- --export-width=$(word 1, $(subst x, , $(@))) \
- --export-height=$(word 2, $(subst x, , $(subst /, , $(@)))) \
- --export-png=hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
+ convert $(subst .png,.svg, $(word 2, $(subst /, , $(@)))) \
+ -size $(word 1, $(subst x, , $(@)))x$(word 2, $(subst x, , $(subst /, , $(@)))) \
+ hicolor/$(word 1, $(subst /, ,$(@)))/apps/$(word 2, $(subst /, , $@))
%.xpm:
mkdir -p pixmaps/
--
2.10.1

2
pkgs/top-level/all-packages.nix
View file

@ -12402,7 +12402,7 @@ with pkgs;
wpa_supplicant = callPackage ../os-specific/linux/wpa_supplicant { };
wpa_supplicant_gui = callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
wpa_supplicant_gui = libsForQt5.callPackage ../os-specific/linux/wpa_supplicant/gui.nix { };
xf86_input_mtrack = callPackage ../os-specific/linux/xf86-input-mtrack { };