diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 5e8931579cb3..a24f350d3f0b 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -3,20 +3,14 @@ , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas , makeWrapper, udev, libgudev, hicolor_icon_theme }: -let - pn = "network-manager-applet"; - major = "1.0"; - # With version 1.0.12 of NM, we are no longer in sync - # version = "${networkmanager.version}.10"; - version = "${major}.10"; -in - stdenv.mkDerivation rec { - name = "network-manager-applet-${version}"; + name = "${pname}-${version}"; + pname = "network-manager-applet"; + version = networkmanager.version; src = fetchurl { - url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz"; - sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh"; + url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; + sha256 = "02b42e7c17c9cd6c840563750da92ce58da1ec621df7f0c2402016026e727756"; }; configureFlags = [ "--sysconfdir=/etc" ]; @@ -34,10 +28,9 @@ stdenv.mkDerivation rec { ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; - preInstall = - '' - installFlagsArray=( "sysconfdir=$out/etc" ) - ''; + preInstall = '' + installFlagsArray=( "sysconfdir=$out/etc" ) + ''; preFixup = '' wrapProgram "$out/bin/nm-applet" \ @@ -50,10 +43,10 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = http://projects.gnome.org/NetworkManager/; description = "NetworkManager control applet for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ phreedom urkud rickynils ]; - platforms = platforms.linux; + platforms = platforms.linux; }; }