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

networkmanagerapplet: add librsvg

Browse Source 
Fix tray icon. Also use wrapGAppsHook instead of custom wrapper.
This commit is contained in:
Nikolay Amiantov 2017-03-01 01:01:02 +03:00
parent f876ae4b92
commit 8aa73bbf55
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/tools/networking/network-manager-applet/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, polkit, isocodes, modemmanager
, libnotify, libsecret, polkit, isocodes, modemmanager, librsvg
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson }:
, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "${pname}-${version}";
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas
polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring
modemmanager jansson
modemmanager jansson librsvg
];
nativeBuildInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ];
propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];
@ -33,16 +33,6 @@ stdenv.mkDerivation rec {
installFlagsArray=( "sysconfdir=$out/etc" )
'';
preFixup = ''
wrapProgram "$out/bin/nm-applet" \
--prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
--prefix PATH ":" "${gnome3.gconf}/bin"
wrapProgram "$out/bin/nm-connection-editor" \
--prefix XDG_DATA_DIRS : "${gnome3.gtk.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
homepage = http://projects.gnome.org/NetworkManager/;
description = "NetworkManager control applet for GNOME";