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

networkmanagerapplet: clean up

Browse Source
This commit is contained in:
Jan Tojnar 2018-08-09 14:35:47 +02:00
parent 807f582d63
commit d2f75c32de
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ 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
, libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection
, libgudev, jansson, wrapGAppsHook, gobjectIntrospection
, libappindicator-gtk3, withGnome ? false }:
let
@ -15,27 +15,28 @@ in stdenv.mkDerivation rec {
sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2";
};
patches = [
# https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19
./libnm-gtk-mbpi.patch
];
mesonFlags = [
"-Dselinux=false"
"-Dappindicator=yes"
"-Dgcr=${if withGnome then "true" else "false"}"
];
outputs = [ "out" "dev" "devdoc" ];
outputs = [ "out" "lib" "dev" "devdoc" "man" ];
buildInputs = [
gnome3.gtk networkmanager libnotify libsecret gsettings-desktop-schemas
polkit isocodes mobile-broadband-provider-info libgudev
modemmanager jansson glib-networking
libappindicator-gtk3
] ++ stdenv.lib.optionals withGnome [ gnome3.gcr webkitgtk ];
] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser
nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ];
propagatedUserEnvPkgs = [
hicolor-icon-theme
];
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py

33
pkgs/tools/networking/network-manager/libnm-gtk-mbpi.patch Normal file
View File

@ -0,0 +1,33 @@
--- a/meson.build
+++ b/meson.build
@@ -137,7 +137,7 @@
mobile_broadband_provider_info_dep = dependency('mobile-broadband-provider-info')
config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', mobile_broadband_provider_info_dep.get_pkgconfig_variable('database'))
else
- config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_prefix, 'share', 'mobile-broadband-provider-info', 'serviceproviders.xml'))
+ config_h.set_quoted('MOBILE_BROADBAND_PROVIDER_INFO_DATABASE', join_paths(nma_datadir, 'mobile-broadband-provider-info', 'serviceproviders.xml'))
endif
gio_dep = dependency('gio-2.0', version: '>= 2.38')
--- a/src/libnm-gtk/nm-mobile-providers.c
+++ b/src/libnm-gtk/nm-mobile-providers.c
@@ -30,10 +30,6 @@
#include "nm-mobile-providers.h"
-#ifndef MOBILE_BROADBAND_PROVIDER_INFO
-#define MOBILE_BROADBAND_PROVIDER_INFO DATADIR"/mobile-broadband-provider-info/serviceproviders.xml"
-#endif
-
#define ISO_3166_COUNTRY_CODES ISO_CODES_PREFIX"/share/xml/iso-codes/iso_3166.xml"
#define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX"/share/locale"
@@ -990,7 +986,7 @@
if (!country_codes)
country_codes = ISO_3166_COUNTRY_CODES;
if (!service_providers)
- service_providers = MOBILE_BROADBAND_PROVIDER_INFO;
+ service_providers = MOBILE_BROADBAND_PROVIDER_INFO_DATABASE;
countries = read_country_codes (country_codes,
cancellable,

2
pkgs/top-level/all-packages.nix
View File

@ -4140,7 +4140,7 @@ with pkgs;
networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { };
networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager/applet.nix { };
networkmanagerapplet = callPackage ../tools/networking/network-manager/applet.nix { };
networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix { };