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

nixos/bluetooth: add extraConfig option (#23427)

Browse Source
This commit is contained in:
Kristoffer Søholm 2017-03-20 14:28:02 +01:00 committed by Franz Pletz
parent 1f0ce0eaf8
commit f9e8ef7e6d
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nixos/modules/services/hardware/bluetooth.nix
View File

@ -14,12 +14,26 @@ in
options = { options = {
hardware.bluetooth.enable = mkEnableOption "support for Bluetooth."; hardware.bluetooth = {
enable = mkEnableOption "support for Bluetooth.";
hardware.bluetooth.powerOnBoot = mkOption { powerOnBoot = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
description = "Whether to power up the default Bluetooth controller on boot."; description = "Whether to power up the default Bluetooth controller on boot.";
};
extraConfig = mkOption {
type = types.lines;
default = "";
example = ''
[General]
ControllerMode = bredr
'';
description = ''
Set additional configuration for system-wide bluetooth (/etc/bluetooth/main.conf).
'';
};
}; };
}; };
@ -30,6 +44,11 @@ in
environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ]; environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
environment.etc = singleton {
source = pkgs.writeText "main.conf" cfg.extraConfig;
target = "bluetooth/main.conf";
};
services.udev.packages = [ bluez-bluetooth ]; services.udev.packages = [ bluez-bluetooth ];
services.dbus.packages = [ bluez-bluetooth ]; services.dbus.packages = [ bluez-bluetooth ];
systemd.packages = [ bluez-bluetooth ]; systemd.packages = [ bluez-bluetooth ];

4
pkgs/os-specific/linux/bluez/bluez5.nix
View File

@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
mkdir $out/sbin mkdir $out/sbin
ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
ln -s ../libexec/bluetooth/obexd $out/sbin/obexd ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
# Add extra configuration
mkdir $out/etc/bluetooth
ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;