From 791d8bbc66889edb67f021e0ddb0849d14c6f6c9 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Wed, 6 Aug 2008 19:26:47 +0000
Subject: [PATCH] Add udev extra option (addUdevPkgs). Add some merge
 functions.

svn path=/nixos/trunk/; revision=12523
---
 system/options.nix       | 13 +++++++++++++
 upstart-jobs/default.nix |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/system/options.nix b/system/options.nix
index 5fd90329e2b..ac1262d7f9b 100644
--- a/system/options.nix
+++ b/system/options.nix
@@ -145,6 +145,8 @@
       description = ''
         A list of additional packages supplying kernel modules.
       '';
+      merge = name: list:
+        pkgsArg: pkgs.lib.concatMap (f: f pkgsArg) list;
     };
 
     kernelModules = mkOption {
@@ -1764,6 +1766,15 @@
           a package, or have an interactive process of extraction
           and cannot be redistributed.
         ";
+        merge = pkgs.lib.mergeListOption;
+      };
+
+      addUdevPkgs = mkOption {
+        default = [];
+        description = "
+          List of packages containing udev rules.
+        ";
+        merge = pkgs.lib.mergeListOption;
       };
       
       sndMode = mkOption {
@@ -2752,6 +2763,8 @@ root        ALL=(ALL) SETENV: ALL
         packages.  The function will be called with the Nix Packages
         collection as its argument for convenience.
       ";
+      merge = name: list:
+        pkgsArg: pkgs.lib.concatMap (f: f pkgsArg) list;
     };
 
     nix = mkOption {
diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix
index ce2cf17060d..9882c590930 100644
--- a/upstart-jobs/default.nix
+++ b/upstart-jobs/default.nix
@@ -100,7 +100,8 @@ let
         ++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal
-        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007;
+        ++ pkgs.lib.optional config.hardware.enableGo7007 kernelPackages.wis_go7007
+        ++ config.services.udev.addUdevPkgs;
     })
       
     # Makes LVM logical volumes available.