* Forward udev events to HAL.

svn path=/nixos/trunk/; revision=9016
This commit is contained in:
Eelco Dolstra 2007-07-22 02:07:02 +00:00
parent 13f94dacc5
commit 333d0dfe17
2 changed files with 13 additions and 3 deletions

View File

@ -30,7 +30,9 @@ import ../upstart-jobs/gather.nix {
inherit (pkgs) stdenv writeText substituteAll udev procps;
inherit (pkgs.lib) cleanSource;
firmwareDirs =
(if config.get ["networking" "enableIntel2200BGFirmware"] then [pkgs.ipw2200fw] else []);
pkgs.lib.optional (config.get ["networking" "enableIntel2200BGFirmware"]) pkgs.ipw2200fw;
extraUdevPkgs =
pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
})
# Makes LVM logical volumes available.
@ -194,7 +196,7 @@ import ../upstart-jobs/gather.nix {
(import ../upstart-jobs/dbus.nix {
inherit (pkgs) stdenv dbus;
dbusServices =
pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
pkgs.lib.optional (config.get ["services" "hal" "enable"]) pkgs.hal;
})
# HAL daemon.

View File

@ -1,4 +1,6 @@
{stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs}:
{ stdenv, writeText, substituteAll, cleanSource, udev, procps, firmwareDirs
, extraUdevPkgs ? []
}:
let
@ -18,6 +20,12 @@ let
for i in $src/*; do
substituteAll $i $out/$(basename $i)
done
shopt -s nullglob
for i in ${toString extraUdevPkgs}; do
for j in $i/etc/udev/rules.d/*; do
ln -s $j $out/$(basename $j)
done
done
";
};