public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

networkmanager-openvpn: Move D-Bus conf file to share/dbus-1/system.d

Browse Source 
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.
This commit is contained in:
worldofpeace 2019-09-15 23:35:43 -04:00
parent 2220086061
commit d2680d9fc7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/networking/network-manager/openvpn/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret
, gtk3, withGnome ? true, gnome3, kmod }: , gtk3, withGnome ? true, gnome3, kmod, fetchpatch }:
let let
pname = "NetworkManager-openvpn"; pname = "NetworkManager-openvpn";
@ -17,6 +17,11 @@ in stdenv.mkDerivation {
src = ./fix-paths.patch; src = ./fix-paths.patch;
inherit kmod openvpn; 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 ] buildInputs = [ openvpn networkmanager ]