From 333d0dfe17a111345607c3838d8a19f1b5ad2c1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 22 Jul 2007 02:07:02 +0000
Subject: [PATCH] * Forward udev events to HAL.

svn path=/nixos/trunk/; revision=9016
---
 upstart-jobs/default.nix |  6 ++++--
 upstart-jobs/udev.nix    | 10 +++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index 2f59794d5bb5..0b16a98cf5db 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -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.
diff --git a/upstart-jobs/udev.nix b/upstart-jobs/udev.nix
index 0bdb9b9cb74b..c29c4b5c5ebd 100644
--- a/upstart-jobs/udev.nix
+++ b/upstart-jobs/udev.nix
@@ -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
     ";
   };