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

* Include the Bluetooth module in module-list.nix.

Browse Source 
svn path=/nixos/trunk/; revision=23486
This commit is contained in:
Eelco Dolstra 2010-08-27 15:32:49 +00:00
parent 4bca743766
commit 59b29535e5
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/module-list.nix
View File

@ -16,9 +16,9 @@
./hardware/network/intel-3945abg.nix ./hardware/network/intel-3945abg.nix
./hardware/network/rt73.nix ./hardware/network/rt73.nix
./hardware/pcmcia.nix ./hardware/pcmcia.nix
./installer/generations-dir/generations-dir.nix
./installer/grub/grub.nix ./installer/grub/grub.nix
./installer/init-script/init-script.nix ./installer/init-script/init-script.nix
./installer/generations-dir/generations-dir.nix
./installer/tools/nixos-checkout.nix ./installer/tools/nixos-checkout.nix
./installer/tools/tools.nix ./installer/tools/tools.nix
./misc/assertions.nix ./misc/assertions.nix
@ -50,6 +50,7 @@
./services/databases/mysql.nix ./services/databases/mysql.nix
./services/databases/postgresql.nix ./services/databases/postgresql.nix
./services/hardware/acpid.nix ./services/hardware/acpid.nix
./services/hardware/bluetooth.nix
./services/hardware/hal.nix ./services/hardware/hal.nix
./services/hardware/pcscd.nix ./services/hardware/pcscd.nix
./services/hardware/udev.nix ./services/hardware/udev.nix
@ -78,8 +79,8 @@
./services/networking/avahi-daemon.nix ./services/networking/avahi-daemon.nix
./services/networking/bind.nix ./services/networking/bind.nix
./services/networking/bitlbee.nix ./services/networking/bitlbee.nix
./services/networking/dhclient.nix
./services/networking/ddclient.nix ./services/networking/ddclient.nix
./services/networking/dhclient.nix
./services/networking/dhcpd.nix ./services/networking/dhcpd.nix
./services/networking/ejabberd.nix ./services/networking/ejabberd.nix
./services/networking/firewall.nix ./services/networking/firewall.nix
@ -94,11 +95,11 @@
./services/networking/portmap.nix ./services/networking/portmap.nix
./services/networking/privoxy.nix ./services/networking/privoxy.nix
./services/networking/quassel.nix ./services/networking/quassel.nix
./services/networking/sabnzbd.nix
./services/networking/ssh/lshd.nix ./services/networking/ssh/lshd.nix
./services/networking/ssh/sshd.nix ./services/networking/ssh/sshd.nix
./services/networking/tftpd.nix ./services/networking/tftpd.nix
./services/networking/vsftpd.nix ./services/networking/vsftpd.nix
./services/networking/sabnzbd.nix
./services/networking/wicd.nix ./services/networking/wicd.nix
./services/networking/wpa_supplicant.nix ./services/networking/wpa_supplicant.nix
./services/networking/xinetd.nix ./services/networking/xinetd.nix
@ -108,17 +109,17 @@
./services/scheduling/fcron.nix ./services/scheduling/fcron.nix
./services/security/tor.nix ./services/security/tor.nix
./services/system/dbus.nix ./services/system/dbus.nix
./services/system/kerberos.nix
./services/system/nscd.nix ./services/system/nscd.nix
./services/system/uptimed.nix ./services/system/uptimed.nix
./services/system/kerberos.nix
./services/ttys/gpm.nix ./services/ttys/gpm.nix
./services/ttys/mingetty.nix ./services/ttys/mingetty.nix
./services/web-servers/apache-httpd/default.nix ./services/web-servers/apache-httpd/default.nix
./services/web-servers/jboss.nix ./services/web-servers/jboss.nix
./services/web-servers/tomcat.nix ./services/web-servers/tomcat.nix
./services/x11/desktop-managers/default.nix ./services/x11/desktop-managers/default.nix
./services/x11/display-managers/default.nix
./services/x11/display-managers/auto.nix ./services/x11/display-managers/auto.nix
./services/x11/display-managers/default.nix
./services/x11/display-managers/kdm.nix ./services/x11/display-managers/kdm.nix
./services/x11/display-managers/slim.nix ./services/x11/display-managers/slim.nix
./services/x11/hardware/synaptics.nix ./services/x11/hardware/synaptics.nix

11
modules/services/hardware/bluetooth.nix
View File

@ -1,4 +1,4 @@
{pkgs, config, ...}: { config, pkgs, ... }:
with pkgs.lib; with pkgs.lib;
@ -8,17 +8,24 @@ with pkgs.lib;
options = { options = {
hardware.bluetooth.enable = mkOption {
default = false;
description = "Whether to enable support for Bluetooth.";
};
}; };
###### implementation ###### implementation
config = { config = mkIf config.hardware.bluetooth.enable {
environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ]; environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ];
services.udev.packages = [ pkgs.bluez ]; services.udev.packages = [ pkgs.bluez ];
services.dbus.packages = [ pkgs.bluez ];
}; };
} }

2
modules/services/hardware/udev.nix
View File

@ -46,7 +46,7 @@ let
# Add the udev rules from other packages. # Add the udev rules from other packages.
for i in ${toString cfg.packages}; do for i in ${toString cfg.packages}; do
echo "Add rules for package $i" echo "Adding rules for package $i"
for j in $i/*/udev/rules.d/*; do for j in $i/*/udev/rules.d/*; do
ln -sv $j $out/$(basename $j) ln -sv $j $out/$(basename $j)
done done