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:48:34 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:46 -0400
commit61221dfdd5f668c8d0b767b9ca452f5b3f22ad79 (patch)
tree512f83dd3869dbb99c08b666486311485aef2362 /pkgs/tools/networking/network-manager
parent233c878aa9e5dacc2254d50fffe2a46e8a9fe21a (diff)
downloadnixlib-61221dfdd5f668c8d0b767b9ca452f5b3f22ad79.tar
nixlib-61221dfdd5f668c8d0b767b9ca452f5b3f22ad79.tar.gz
nixlib-61221dfdd5f668c8d0b767b9ca452f5b3f22ad79.tar.bz2
nixlib-61221dfdd5f668c8d0b767b9ca452f5b3f22ad79.tar.lz
nixlib-61221dfdd5f668c8d0b767b9ca452f5b3f22ad79.tar.xz
nixlib-61221dfdd5f668c8d0b767b9ca452f5b3f22ad79.tar.zst
nixlib-61221dfdd5f668c8d0b767b9ca452f5b3f22ad79.zip
networkmanager-iodine: 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/iodine/default.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/tools/networking/network-manager/iodine/default.nix b/pkgs/tools/networking/network-manager/iodine/default.nix
index 27e091b6b602..85bb29b36419 100644
--- a/pkgs/tools/networking/network-manager/iodine/default.nix
+++ b/pkgs/tools/networking/network-manager/iodine/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, iodine, intltool, pkgconfig, networkmanager, libsecret, gtk3
-, withGnome ? true, gnome3 }:
+, withGnome ? true, gnome3, fetchpatch }:
 
 let
   pname = "NetworkManager-iodine";
@@ -17,6 +17,11 @@ in stdenv.mkDerivation {
       src = ./fix-paths.patch;
       inherit iodine;
     })
+    # Don't use etc/dbus-1/system.d
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/network-manager-iodine/merge_requests/2.patch";
+      sha256 = "108pkf0mddj32s46k7jkmpwcaq2ylci4dqpp7wck3zm9q2jffff2";
+    })
   ];
 
   buildInputs = [ iodine networkmanager ]