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.
This commit is contained in:
worldofpeace 2019-09-16 12:33:34 -04:00
parent 4e2597d1b8
commit 5e55f20ebe

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub { stdenv, fetchFromGitHub
, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
, acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2
, lvm2, pam, python, utillinux }: , lvm2, pam, python, utillinux, fetchpatch }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snapper"; pname = "snapper";
@ -23,6 +23,14 @@ stdenv.mkDerivation rec {
lvm2 pam python utillinux 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 = '' postPatch = ''
# Hard-coded root paths, hard-coded root paths everywhere... # Hard-coded root paths, hard-coded root paths everywhere...
for file in {client,data,pam,scripts}/Makefile.am; do for file in {client,data,pam,scripts}/Makefile.am; do