about summary refs log tree commit diff
path: root/pkgs/tools/networking/network-manager
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-15 23:44:39 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:46 -0400
commit233c878aa9e5dacc2254d50fffe2a46e8a9fe21a (patch)
treed8e5c7fd7c9ee64f8baf74d43ac330545338069f /pkgs/tools/networking/network-manager
parent8d7adf047625b59c9cf8a6059cd9d5131f94318a (diff)
downloadnixlib-233c878aa9e5dacc2254d50fffe2a46e8a9fe21a.tar
nixlib-233c878aa9e5dacc2254d50fffe2a46e8a9fe21a.tar.gz
nixlib-233c878aa9e5dacc2254d50fffe2a46e8a9fe21a.tar.bz2
nixlib-233c878aa9e5dacc2254d50fffe2a46e8a9fe21a.tar.lz
nixlib-233c878aa9e5dacc2254d50fffe2a46e8a9fe21a.tar.xz
nixlib-233c878aa9e5dacc2254d50fffe2a46e8a9fe21a.tar.zst
nixlib-233c878aa9e5dacc2254d50fffe2a46e8a9fe21a.zip
networkmanager-fortisslvpn: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
Diffstat (limited to 'pkgs/tools/networking/network-manager')
-rw-r--r--pkgs/tools/networking/network-manager/fortisslvpn/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
index 7773548576b0..dbf175d20c95 100644
--- a/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
+++ b/pkgs/tools/networking/network-manager/fortisslvpn/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, openfortivpn, intltool, pkgconfig, file, gtk3,
-networkmanager, ppp, libsecret, withGnome ? true, gnome3 }:
+networkmanager, ppp, libsecret, withGnome ? true, gnome3, fetchpatch }:
 
 let
   pname = "NetworkManager-fortisslvpn";
@@ -17,6 +17,11 @@ in stdenv.mkDerivation {
       src = ./fix-paths.patch;
       inherit openfortivpn;
     })
+    # Don't use etc/dbus-1/system.d
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/merge_requests/11.patch";
+      sha256 = "0l7l2r1njh62lh2pf497ibf99sgkvjsj58xr76qx3jxgq9zfw6n9";
+    })
   ];
 
   buildInputs = [ openfortivpn networkmanager ppp ]