mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
* Forward udev events to HAL.
svn path=/nixos/trunk/; revision=9016
This commit is contained in:
parent
13f94dacc5
commit
333d0dfe17
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
";
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue