From 57af9d74e2e3092e538743b1b0d913bba545bfdc Mon Sep 17 00:00:00 2001 From: Arie Middelkoop Date: Tue, 21 Feb 2012 10:02:58 +0000 Subject: [PATCH] Applied the patch of James Cook. svn path=/nixos/trunk/; revision=32445 --- modules/services/hardware/udev.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/services/hardware/udev.nix b/modules/services/hardware/udev.nix index 6caac8f8ca25..9a38c501411f 100644 --- a/modules/services/hardware/udev.nix +++ b/modules/services/hardware/udev.nix @@ -188,12 +188,20 @@ in List of directories containing firmware files. Such files will be loaded automatically if the kernel asks for them (i.e., when it has detected specific hardware that requires - firmware to function). + firmware to function). If more than one path contains a + firmware file with the same name, the first path in the list + takes precedence. Note that you must rebuild your system if + you add files to any of these directories. For quick testing, + put firmware files in /root/test-firmware and add that + directory to the list. + Note that you can also add firmware packages to this + list as these are directories in the nix store. ''; apply = list: pkgs.buildEnv { name = "firmware"; paths = list; pathsToLink = [ "/" ]; + ignoreCollisions = true; }; };