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

Patch gnome-control-center not to override VPN plugin paths.

Browse Source 
The network-manager vpn plugin configuration files contain the correct
absolute paths to the plugin libraries in the store; however upstream
(unsuccessfully) tries to find them in a predefined path.
This commit is contained in:
Gabriel Ebner 2015-03-16 13:21:23 +01:00
parent d848e34616
commit 9a971364ac
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
View File

@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
done
'';
patches = [ ./search_providers_dir.patch ];
patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ];
meta = with stdenv.lib; {
description = "Single sign-on framework for GNOME";

19
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
index 7dc23c2..fcb1384 100644
--- a/panels/network/connection-editor/vpn-helpers.c
+++ b/panels/network/connection-editor/vpn-helpers.c
@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
if (!so_path)
goto next;
- /* Remove any path and extension components, then reconstruct path
- * to the SO in LIBDIR
- */
- so_name = g_path_get_basename (so_path);
- g_free (so_path);
- so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
- g_free (so_name);
-
module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!module) {
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "