diff options
Diffstat (limited to 'pkgs/tools/networking/network-manager-applet/default.nix')
| -rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 62 |
1 files changed, 35 insertions, 27 deletions
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 20bab09c2a7..dd32cebea11 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,52 +1,60 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes, modemmanager +{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 +, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas -, udev, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk +, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection , libindicator-gtk3, libappindicator-gtk3, withGnome ? false }: -stdenv.mkDerivation rec { - name = "${pname}-${major}.${minor}"; - pname = "network-manager-applet"; - major = "1.8"; - minor = "6"; +let + pname = "network-manager-applet"; + version = "1.8.10"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; }; - configureFlags = [ - "--sysconfdir=/etc" - "--without-selinux" - "--with-appindicator" + mesonFlags = [ + "-Dselinux=false" + "-Dappindicator=true" + "-Dgcr=${if withGnome then "true" else "false"}" ]; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; buildInputs = [ - gnome3.gtk libglade networkmanager libnotify libsecret gsettings-desktop-schemas - polkit isocodes udev libgudev gnome3.libgnome-keyring + gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas + polkit isocodes libgudev modemmanager jansson glib-networking libindicator-gtk3 libappindicator-gtk3 - ] ++ stdenv.lib.optional withGnome webkitgtk; + ] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ]; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ]; - propagatedUserEnvPkgs = [ gnome3.gnome-keyring hicolor-icon-theme ]; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; - makeFlags = [ - ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' + NIX_CFLAGS = [ + ''-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml\"'' ]; - preInstall = '' - installFlagsArray=( "sysconfdir=$out/etc" ) + postPatch = '' + chmod +x meson_post_install.py # patchShebangs requires executable file + patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "networkmanagerapplet"; + }; + }; + meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "NetworkManager control applet for GNOME"; - license = licenses.gpl2; + license = licenses.gpl2; maintainers = with maintainers; [ phreedom rickynils ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } |