Author: amiddelk
Date: Tue Feb 21 10:02:58 2012
New Revision: 32445
URL: https://nixos.org/websvn/nix/?rev=32445&sc=1
Log:
Applied the patch of James Cook.
Modified:
nixos/trunk/modules/services/hardware/udev.nix
Modified: nixos/trunk/modules/services/hardware/udev.nix
==============================================================================
--- nixos/trunk/modules/services/hardware/udev.nix Tue Feb 21 09:01:56
2012 (r32444)
+++ nixos/trunk/modules/services/hardware/udev.nix Tue Feb 21 10:02:58
2012 (r32445)
@@ -188,12 +188,20 @@
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;
};
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
