pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #6829 from gebner/gnome-control-center-vpn-sopath

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

lethalman 1099ea2d 04611ab6

+20 -1
unified split
+1 -1
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
··· 49 49 done 50 50 ''; 51 51 52 - patches = [ ./search_providers_dir.patch ]; 52 + patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ]; 53 53 54 54 meta = with stdenv.lib; { 55 55 description = "Single sign-on framework for GNOME";
+19
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
··· 1 + diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c 2 + index 7dc23c2..fcb1384 100644 3 + --- a/panels/network/connection-editor/vpn-helpers.c 4 + +++ b/panels/network/connection-editor/vpn-helpers.c 5 + @@ -95,14 +95,6 @@ vpn_get_plugins (GError **error) 6 + if (!so_path) 7 + goto next; 8 + 9 + - /* Remove any path and extension components, then reconstruct path 10 + - * to the SO in LIBDIR 11 + - */ 12 + - so_name = g_path_get_basename (so_path); 13 + - g_free (so_path); 14 + - so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL); 15 + - g_free (so_name); 16 + - 17 + module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); 18 + if (!module) { 19 + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "