diff options
| -rw-r--r-- | pkgs/tools/bluetooth/blueman/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 6dce2a38798a..0c298aa1f218 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 -, obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp +, obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor_icon_theme, librsvg, wrapGAppsHook , withPulseAudio ? true, libpulseaudio }: @@ -9,7 +9,7 @@ let in stdenv.mkDerivation rec { name = "blueman-${version}"; version = "2.0.4"; - + src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz"; sha256 = "03s305mbc57nl3sq5ywh9casz926k4aqnylgaidli8bmgz1djbg9"; @@ -17,8 +17,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython wrapGAppsHook ]; - buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf librsvg - gsettings_desktop_schemas hicolor_icon_theme ] + buildInputs = [ bluez gtk3 pythonPackages.python libnotify librsvg hicolor_icon_theme ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; @@ -28,7 +27,7 @@ in stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ dbus-python pygobject3 pycairo ]; - propagatedUserEnvPkgs = [ obex_data_server dconf ]; + propagatedUserEnvPkgs = [ obex_data_server ]; configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce797efcc562..40978badba0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1138,7 +1138,6 @@ with pkgs; }; blueman = callPackage ../tools/bluetooth/blueman { - inherit (gnome3) dconf gsettings_desktop_schemas; withPulseAudio = config.pulseaudio or true; }; |