diff options
| author | Domen Kožar <domen@dev.si> | 2014-01-26 09:58:47 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-01-26 09:58:47 +0100 |
| commit | a7d0a53d9ed7f74a206dcda2c36d433e030f6822 (patch) | |
| tree | 2c99c6b7e53ce4bff5ac456341e351bcb0550d4e /pkgs/tools | |
| parent | bf8b81f538020c68ec018cc3e5b682d828a64ea5 (diff) | |
| parent | f1f0b3a205c07a2dbdbf8ba579a155855de19b57 (diff) | |
| download | nixlib-a7d0a53d9ed7f74a206dcda2c36d433e030f6822.tar nixlib-a7d0a53d9ed7f74a206dcda2c36d433e030f6822.tar.gz nixlib-a7d0a53d9ed7f74a206dcda2c36d433e030f6822.tar.bz2 nixlib-a7d0a53d9ed7f74a206dcda2c36d433e030f6822.tar.lz nixlib-a7d0a53d9ed7f74a206dcda2c36d433e030f6822.tar.xz nixlib-a7d0a53d9ed7f74a206dcda2c36d433e030f6822.tar.zst nixlib-a7d0a53d9ed7f74a206dcda2c36d433e030f6822.zip | |
merge
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 0c2d02a5e775..4d2dff22d114 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf -, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring, gnome_keyring +{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 +, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, networkmanager_openvpn, networkmanager_vpnc , networkmanager_openconnect, udev, hicolor_icon_theme }: @@ -19,15 +19,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk libglade networkmanager libnotify libsecret dbus_glib - polkit isocodes makeWrapper udev GConf libgnome_keyring + gnome3.gtk libglade networkmanager libnotify libsecret dbus_glib + polkit isocodes makeWrapper udev gnome3.gconf gnome3.libgnome_keyring ]; nativeBuildInputs = [ intltool pkgconfig ]; - propagatedUserEnvPkgs = [ GConf gnome_keyring hicolor_icon_theme ]; - - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK + propagatedUserEnvPkgs = [ gnome3.gconf gnome3.gnome_keyring hicolor_icon_theme ]; makeFlags = [ ''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 XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/share" \ --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \ - --prefix PATH ":" "${GConf}/bin" + --prefix PATH ":" "${gnome3.gconf}/bin" ''; meta = with stdenv.lib; { |