alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

blueman: use wrapGAppsHook

Browse source
This commit is contained in:
Jörg Thalheim 2017-05-11 13:37:00 +01:00
parent 728b8ab483
commit 3dc109cbc2
No known key found for this signature in database
GPG key ID: CA4106B8D7CC79FA
2 changed files with 4 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,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") ];

1
pkgs/top-level/all-packages.nix
View file

@ -1138,7 +1138,6 @@ with pkgs;
};
blueman = callPackage ../tools/bluetooth/blueman {
inherit (gnome3) dconf gsettings_desktop_schemas;
withPulseAudio = config.pulseaudio or true;
};