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

Merge pull request #45707 from jtojnar/drop-nm-gtk

Browse Source 
Drop libnm-gtk
This commit is contained in:
Jan Tojnar 2018-08-28 17:50:42 +02:00 committed by GitHub
commit bbe620f77b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3
, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl
, libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl, docbook_xml_dtd_43
, mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas
, libgudev, jansson, wrapGAppsHook, gobjectIntrospection
, libappindicator-gtk3, withGnome ? false }:
@ -15,12 +15,8 @@ in stdenv.mkDerivation rec {
sha256 = "0lmlkh4yyl9smvkgrzshn127zqfbp9f41f448ks8dlhhm38s38v2";
};
patches = [
# https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/19
./libnm-gtk-mbpi.patch
];
mesonFlags = [
"-Dlibnm_gtk=false" # It is deprecated
"-Dselinux=false"
"-Dappindicator=yes"
"-Dgcr=${if withGnome then "true" else "false"}"
@ -35,7 +31,7 @@ in stdenv.mkDerivation rec {
libappindicator-gtk3
] ++ stdenv.lib.optionals withGnome [ gnome3.gcr ]; # advanced certificate chooser
nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl libxml2 ];
nativeBuildInputs = [ meson ninja intltool pkgconfig wrapGAppsHook gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_43 libxml2 ];
postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file

1
pkgs/tools/networking/network-manager/fortisslvpn/default.nix
View File

@ -25,6 +25,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig ];
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/tmp"
];

1
pkgs/tools/networking/network-manager/iodine/default.nix
View File

@ -28,6 +28,7 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/" # needed for the management socket under /run/NetworkManager
];

1
pkgs/tools/networking/network-manager/l2tp/default.nix
View File

@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
'';
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/var"
"--sysconfdir=$(out)/etc"

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

@ -1,33 +0,0 @@
--- 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,

1
pkgs/tools/networking/network-manager/openvpn/default.nix
View File

@ -25,6 +25,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig libxml2 ];
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
"--localstatedir=/" # needed for the management socket under /run/NetworkManager
];

1
pkgs/tools/networking/network-manager/strongswan.nix
View File

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
configureFlags = [
"--without-libnm-glib"
"--with-charon=${strongswanNM}/libexec/ipsec/charon-nm"
"--with-nm-libexecdir=$(out)/libexec"
"--with-nm-plugindir=$(out)/lib/NetworkManager"

1
pkgs/tools/networking/network-manager/vpnc/default.nix
View File

@ -24,6 +24,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig file ];
configureFlags = [
"--without-libnm-glib"
"--with-gnome=${if withGnome then "yes" else "no"}"
];