From d2680d9fc77bf77c1bedb92f944341a4eac01647 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 15 Sep 2019 23:35:43 -0400 Subject: [PATCH] networkmanager-openvpn: 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. --- pkgs/tools/networking/network-manager/openvpn/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 04ec49f7b9b..bedc7875fb7 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod }: +, gtk3, withGnome ? true, gnome3, kmod, fetchpatch }: let pname = "NetworkManager-openvpn"; @@ -17,6 +17,11 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit kmod openvpn; }) + # Don't use etc/dbus-1/system.d + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/merge_requests/13.patch"; + sha256 = "06cvqi28v72dd53fw8ix95mqj885xhwi8qcs2q7hvm5bvnhwn704"; + }) ]; buildInputs = [ openvpn networkmanager ]