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

network-manager-applet: gtk2 -> gtk3

Browse Source
This commit is contained in:
Domen Kožar 2014-01-26 00:16:24 +01:00
parent 344e440835
commit d8a31ba948
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring , libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring
, mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
, makeWrapper, networkmanager_openvpn, networkmanager_vpnc , makeWrapper, networkmanager_openvpn, networkmanager_vpnc
, networkmanager_openconnect, udev, hicolor_icon_theme }: , networkmanager_openconnect, udev, hicolor_icon_theme }:
@ -19,15 +19,13 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
gtk libglade networkmanager libnotify libsecret dbus_glib gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib
polkit isocodes makeWrapper udev GConf libgnome_keyring polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring
]; ];
nativeBuildInputs = [ intltool pkgconfig ]; nativeBuildInputs = [ intltool pkgconfig ];
propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ];
configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK
makeFlags = [ makeFlags = [
''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
@ -50,7 +48,7 @@ stdenv.mkDerivation rec {
--prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \ --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \
--set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
--prefix PATH ":" "${GConf}/bin" --prefix PATH ":" "${gnome3.gconf}/bin"
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {