public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

networkmanager-applet: 1.8.10 → 1.8.14

Browse Source 
Password entering should now work even without GNOME Keyring:
https://gitlab.gnome.org/GNOME/network-manager-applet/issues/3
This commit is contained in:
Jan Tojnar 2018-07-05 23:17:22 +02:00
parent f6e83edf36
commit e056ac3f98
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/tools/networking/network-manager/applet.nix
View File

@ -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 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection
@ -6,18 +6,25 @@
let let
pname = "network-manager-applet"; pname = "network-manager-applet";
version = "1.8.10"; version = "1.8.14";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; 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 = [ mesonFlags = [
"-Dselinux=false" "-Dselinux=false"
"-Dappindicator=true" "-Dappindicator=yes"
"-Dgcr=${if withGnome then "true" else "false"}" "-Dgcr=${if withGnome then "true" else "false"}"
]; ];
@ -34,7 +41,6 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ propagatedUserEnvPkgs = [
hicolor-icon-theme hicolor-icon-theme
gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967
]; ];
NIX_CFLAGS = [ NIX_CFLAGS = [