diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-05 23:17:22 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2018-07-13 18:31:33 +0200 |
| commit | e056ac3f9856b71b4c0eaeb11aa83b775ae30897 (patch) | |
| tree | b9a0da09f0156134cafe800ef38fb381eccdd9b3 /pkgs/tools | |
| parent | f6e83edf36a1444e8fb57c787163b94a02584f13 (diff) | |
| download | nixlib-e056ac3f9856b71b4c0eaeb11aa83b775ae30897.tar nixlib-e056ac3f9856b71b4c0eaeb11aa83b775ae30897.tar.gz nixlib-e056ac3f9856b71b4c0eaeb11aa83b775ae30897.tar.bz2 nixlib-e056ac3f9856b71b4c0eaeb11aa83b775ae30897.tar.lz nixlib-e056ac3f9856b71b4c0eaeb11aa83b775ae30897.tar.xz nixlib-e056ac3f9856b71b4c0eaeb11aa83b775ae30897.tar.zst nixlib-e056ac3f9856b71b4c0eaeb11aa83b775ae30897.zip | |
networkmanager-applet: 1.8.10 → 1.8.14
Password entering should now work even without GNOME Keyring: https://gitlab.gnome.org/GNOME/network-manager-applet/issues/3
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/network-manager/applet.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index ecd10a139766..98b9b0aef4d6 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 +{ stdenv, fetchurl, fetchpatch, 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 , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection @@ -6,18 +6,25 @@ let pname = "network-manager-applet"; - version = "1.8.10"; + version = "1.8.14"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; + sha256 = "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya"; }; + patches = [ + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch; + sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk"; + }) + ]; + mesonFlags = [ "-Dselinux=false" - "-Dappindicator=true" + "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" ]; @@ -34,7 +41,6 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ hicolor-icon-theme - gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967 ]; NIX_CFLAGS = [ |