polkit: 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:
parent
8e69437fee
commit
9d0e05233f
1 changed files with 9 additions and 1 deletions
|
@ -1,4 +1,4 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl
|
{ stdenv, fetchurl, pkgconfig, glib, expat, pam, perl, fetchpatch
|
||||||
, intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus
|
, intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus
|
||||||
, docbook_xml_dtd_412, gtk-doc, coreutils
|
, docbook_xml_dtd_412, gtk-doc, coreutils
|
||||||
, useSystemd ? stdenv.isLinux, systemd
|
, useSystemd ? stdenv.isLinux, systemd
|
||||||
|
@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1c9lbpndh5zis22f154vjrhnqw65z8s85nrgl42v738yf6g0q5w8";
|
sha256 = "1c9lbpndh5zis22f154vjrhnqw65z8s85nrgl42v738yf6g0q5w8";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Don't use etc/dbus-1/system.d
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://gitlab.freedesktop.org/polkit/polkit/merge_requests/11.patch";
|
||||||
|
sha256 = "17lv7xj5ksa27iv4zpm4zwd4iy8zbwjj4ximslfq3sasiz9kxhlp";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
|
||||||
sed -i -e "s/-Wl,--as-needed//" configure.ac
|
sed -i -e "s/-Wl,--as-needed//" configure.ac
|
||||||
'';
|
'';
|
||||||
|
|
Loading…
Reference in a new issue