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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Jan Tojnar
2019-10-03 01:47:08 +02:00
parent 3a4658ea04 3dc58eda52
commit b3fcd9375d
514 changed files with 8443 additions and 3195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/bluetooth/blueman/default.nix
+3 -6
View File
@@ -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, fetchpatch }:
, networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }:
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;
patches = [
# Don't use etc/dbus-1/system.d