diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:19 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:19 +0000 |
| commit | 1b2c28b0ee3f669d80a3769c23d74a9258ec9252 (patch) | |
| tree | cf2a42210f860cf76b0eed7ae1c05f7868f4fcdc | |
| parent | be40fe7ae508e6c701ad63b9a228b1e58c9fa8e1 (diff) | |
| download | nixpkgs-1b2c28b0ee3f669d80a3769c23d74a9258ec9252.tar nixpkgs-1b2c28b0ee3f669d80a3769c23d74a9258ec9252.tar.gz nixpkgs-1b2c28b0ee3f669d80a3769c23d74a9258ec9252.tar.bz2 nixpkgs-1b2c28b0ee3f669d80a3769c23d74a9258ec9252.tar.lz nixpkgs-1b2c28b0ee3f669d80a3769c23d74a9258ec9252.tar.xz nixpkgs-1b2c28b0ee3f669d80a3769c23d74a9258ec9252.tar.zst nixpkgs-1b2c28b0ee3f669d80a3769c23d74a9258ec9252.zip | |
blueman: move defaults to package file
| -rw-r--r-- | pkgs/tools/bluetooth/blueman/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index 63affdde718..84a2375302f 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 +{ config, stdenv, lib, fetchurl, intltool, pkgconfig, python3Packages, bluez, gtk3 , obex_data_server, xdg_utils, libnotify, dnsmasq, dhcp , hicolor-icon-theme, librsvg, wrapGAppsHook, gobject-introspection -, withPulseAudio ? true, libpulseaudio }: +, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: let pythonPackages = python3Packages; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3842e9cb8e8..f7faa9161bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1762,9 +1762,7 @@ in inherit (python27Packages) pillow; }; - blueman = callPackage ../tools/bluetooth/blueman { - withPulseAudio = config.pulseaudio or true; - }; + blueman = callPackage ../tools/bluetooth/blueman { }; bmrsa = callPackage ../tools/security/bmrsa/11.nix { }; |