diff options
author | Nikolay Amiantov <ab@fmap.me> | 2017-03-01 01:01:02 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2017-03-01 02:21:35 +0300 |
commit | 8aa73bbf55884d2a94db0e54aa5ceb92a513371b (patch) | |
tree | fb29f6b27fc8b551baf63988e503ebef9b27e0e5 /pkgs/tools/networking/network-manager-applet | |
parent | f876ae4b924a7dbc97fd49185129119ed4dda827 (diff) | |
download | nixlib-8aa73bbf55884d2a94db0e54aa5ceb92a513371b.tar nixlib-8aa73bbf55884d2a94db0e54aa5ceb92a513371b.tar.gz nixlib-8aa73bbf55884d2a94db0e54aa5ceb92a513371b.tar.bz2 nixlib-8aa73bbf55884d2a94db0e54aa5ceb92a513371b.tar.lz nixlib-8aa73bbf55884d2a94db0e54aa5ceb92a513371b.tar.xz nixlib-8aa73bbf55884d2a94db0e54aa5ceb92a513371b.tar.zst nixlib-8aa73bbf55884d2a94db0e54aa5ceb92a513371b.zip |
networkmanagerapplet: add librsvg
Fix tray icon. Also use wrapGAppsHook instead of custom wrapper.
Diffstat (limited to 'pkgs/tools/networking/network-manager-applet')
-rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 8d62cb1bc74d..a212e4f053d3 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -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"; |