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

Merge pull request #70149 from worldofpeace/blueman-fix

Browse Source 
blueman: no optional networkmanager
This commit is contained in:
worldofpeace 2019-10-01 05:28:26 +00:00 committed by GitHub
commit fb170183c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 { config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3
, obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute , obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute
, gnome3, librsvg, wrapGAppsHook, gobject-introspection , gnome3, librsvg, wrapGAppsHook, gobject-introspection
, withNetworkManager ? , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
config.networking.networkmanager.enable or false, networkmanager
, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }:
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
@ -24,10 +22,9 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ bluez gtk3 pythonPackages.python librsvg buildInputs = [ bluez gtk3 pythonPackages.python librsvg
gnome3.adwaita-icon-theme iproute libappindicator ] gnome3.adwaita-icon-theme iproute libappindicator networkmanager ]
++ pythonPath ++ pythonPath
++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPulseAudio libpulseaudio;
++ lib.optional withNetworkManager networkmanager;
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