blueman: 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
d6d3ccf8b8
commit
271c4b16e9
1 changed files with 9 additions and 1 deletions
|
@ -3,7 +3,7 @@
|
|||
, gnome3, librsvg, wrapGAppsHook, gobject-introspection
|
||||
, withNetworkManager ?
|
||||
config.networking.networkmanager.enable or false, networkmanager
|
||||
, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
|
||||
, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
|
||||
|
||||
let
|
||||
pythonPackages = python3Packages;
|
||||
|
@ -29,6 +29,14 @@ in stdenv.mkDerivation rec {
|
|||
++ lib.optional withPulseAudio libpulseaudio
|
||||
++ lib.optional withNetworkManager networkmanager;
|
||||
|
||||
patches = [
|
||||
# Don't use etc/dbus-1/system.d
|
||||
(fetchpatch {
|
||||
url = "https://patch-diff.githubusercontent.com/raw/blueman-project/blueman/pull/1103.patch";
|
||||
sha256 = "0zqdi6ya97jljwinn10n9q6bixl23ww55c0pkhskn140qnrj42wf";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = lib.optionalString withPulseAudio ''
|
||||
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue