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

blueman: fix networking, settings

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-02-25 17:58:09 +03:00
parent d9f5e94bae
commit 69932f905a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3 { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
, obex_data_server, xdg_utils, libnotify, dconf , obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
, withPulseAudio ? true, libpulseaudio }: , withPulseAudio ? true, libpulseaudio }:
let let
binPath = lib.makeBinPath [ xdg_utils ]; binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "blueman-${version}"; name = "blueman-${version}";
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ]; nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf ] buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf gsettings_desktop_schemas ]
++ pythonPath ++ pythonPath
++ lib.optional withPulseAudio libpulseaudio; ++ lib.optional withPulseAudio libpulseaudio;
@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
pythonPath = with pythonPackages; [ dbus pygobject3 ]; pythonPath = with pythonPackages; [ dbus pygobject3 ];
propagatedUserEnvPkgs = [ obex_data_server ]; propagatedUserEnvPkgs = [ obex_data_server dconf ];
configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ]; configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];

2
pkgs/top-level/all-packages.nix
View File

@ -1031,7 +1031,7 @@ let
bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
blueman = callPackage ../tools/bluetooth/blueman { blueman = callPackage ../tools/bluetooth/blueman {
inherit (gnome3) dconf; inherit (gnome3) dconf gsettings_desktop_schemas;
withPulseAudio = config.pulseaudio or true; withPulseAudio = config.pulseaudio or true;
}; };