public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blueman: Move D-Bus conf file to share/dbus-1/system.d

Browse Source 
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-15 23:21:36 -04:00
parent d6d3ccf8b8
commit 271c4b16e9
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/bluetooth/blueman/default.nix
View File

@ -3,7 +3,7 @@
, gnome3, librsvg, wrapGAppsHook, gobject-introspection , gnome3, librsvg, wrapGAppsHook, gobject-introspection
, withNetworkManager ? , withNetworkManager ?
config.networking.networkmanager.enable or false, networkmanager config.networking.networkmanager.enable or false, networkmanager
, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: , withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
@ -29,6 +29,14 @@ in stdenv.mkDerivation rec {
++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withNetworkManager networkmanager; ++ 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 '' postPatch = lib.optionalString withPulseAudio ''
sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py
''; '';