From 70114d1b0dd91e9d6d80d2a43520e836ba34d40e Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 1 Aug 2012 11:51:41 +0200 Subject: [PATCH] networkmanagerapplet: Update to 0.9.4.1 Also add dependency on mobile_broadband_provider_info. --- .../network-manager-applet/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d22d5f50988..1a9b9485749 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade -, networkmanager, GConf, libnotify, libgnome_keyring, dbus_glib -, polkit, isocodes }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk, libglade, networkmanager, GConf +, libnotify, libgnome_keyring, dbus_glib, polkit, isocodes +, mobile_broadband_provider_info }: let pn = "network-manager-applet"; major = "0.9"; - version = "${major}.2.0"; + version = "${major}.4.1"; in stdenv.mkDerivation rec { @@ -13,19 +13,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de"; + sha256 = "b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7"; }; - buildInputs = [ gtk libglade networkmanager GConf libnotify libgnome_keyring - polkit isocodes ]; + buildInputs = [ + gtk libglade networkmanager GConf libnotify libgnome_keyring dbus_glib + polkit isocodes + ]; buildNativeInputs = [ intltool pkgconfig ]; + makeFlags = [ + ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + ]; + meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; license = licenses.gpl2; - maintainers = [ maintainers.phreedom maintainers.urkud ]; + maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; }; }