about summary refs log tree commit diff
path: root/pkgs/tools/misc/snapper
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-16 12:33:34 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:47 -0400
commit5e55f20ebe01a787ac1182d2350e72eee017f667 (patch)
tree82961e1c556d8d6cf16c53da9cdc61fba3d31b26 /pkgs/tools/misc/snapper
parent4e2597d1b80bd3eb983b2dc43f6e081d3fdc8e56 (diff)
snapper: 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/misc/snapper')
-rw-r--r--pkgs/tools/misc/snapper/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 5eba12285ded7..6c9cbc5684617 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
-, lvm2, pam, python, utillinux }:
+, lvm2, pam, python, utillinux, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "snapper";
@@ -23,6 +23,14 @@ stdenv.mkDerivation rec {
     lvm2 pam python utillinux
   ];
 
+  patches = [
+    # Don't use etc/dbus-1/system.d
+    (fetchpatch {
+      url = "https://github.com/openSUSE/snapper/commit/c51708aea22d9436da287cba84424557ad03644b.patch";
+      sha256 = "106pf7pv8z3q37c8ckmgwxs1phf2fy7l53a9g5xq5kk2rjj1cx34";
+    })
+  ];
+
   postPatch = ''
     # Hard-coded root paths, hard-coded root paths everywhere...
     for file in {client,data,pam,scripts}/Makefile.am; do