about summary refs log tree commit diff
path: root/pkgs/tools/networking/network-manager/openconnect
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-15 23:39:14 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:46 -0400
commit43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab (patch)
tree7af8284ab05f8d84624e96d89fc2c41e285d544c /pkgs/tools/networking/network-manager/openconnect
parentd2680d9fc77bf77c1bedb92f944341a4eac01647 (diff)
downloadnixlib-43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab.tar
nixlib-43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab.tar.gz
nixlib-43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab.tar.bz2
nixlib-43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab.tar.lz
nixlib-43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab.tar.xz
nixlib-43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab.tar.zst
nixlib-43e14dbdd2e7bea39e18ca4c70c2d34f144d23ab.zip
networkmanager-openconnect: 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/openconnect')
-rw-r--r--pkgs/tools/networking/network-manager/openconnect/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/networking/network-manager/openconnect/default.nix b/pkgs/tools/networking/network-manager/openconnect/default.nix
index 4236c9e18184..7db0e59beab4 100644
--- a/pkgs/tools/networking/network-manager/openconnect/default.nix
+++ b/pkgs/tools/networking/network-manager/openconnect/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, openconnect, intltool, pkgconfig, autoreconfHook, networkmanager, gcr, libsecret, file
-, gtk3, withGnome ? true, gnome3, kmod }:
+, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }:
 
 let
   pname   = "NetworkManager-openconnect";
@@ -17,6 +17,11 @@ in stdenv.mkDerivation {
       src = ./fix-paths.patch;
       inherit kmod openconnect;
     })
+    # Don't use etc/dbus-1/system.d
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/NetworkManager-openconnect/merge_requests/9.patch";
+      sha256 = "0yd2dmq6gq6y4czr7dqdgaiqvw2vyv2gikznpfdxyfn2v1pcrk9m";
+    })
   ];
 
   buildInputs = [ openconnect networkmanager ]