From fcb84c55343b06683bd45708165a9ae89f03c542 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 30 Sep 2019 22:55:17 -0400 Subject: [PATCH] blueman: no optional networkmanager blueman declares NetworkManager gi bindings as a required runtime dependency [0] Fixes #69555 [0]: https://github.com/blueman-project/blueman/blob/531da47b06de3617492cc5ae5530ca8b3f2e12a4/Dependencies.md --- pkgs/tools/bluetooth/blueman/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 8e393ac3f13..01ab2eefc21 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,9 +1,7 @@ { config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 , obex_data_server, xdg_utils, dnsmasq, dhcp, libappindicator, iproute , gnome3, librsvg, wrapGAppsHook, gobject-introspection -, withNetworkManager ? - config.networking.networkmanager.enable or false, networkmanager -, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: +, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: let pythonPackages = python3Packages; @@ -24,10 +22,9 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute libappindicator ] + gnome3.adwaita-icon-theme iproute libappindicator networkmanager ] ++ pythonPath - ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withNetworkManager networkmanager; + ++ lib.optional withPulseAudio libpulseaudio; postPatch = lib.optionalString withPulseAudio '' sed -i 's,CDLL(",CDLL("${libpulseaudio.out}/lib/,g' blueman/main/PulseAudioUtils.py