about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-03-27 22:56:17 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-03-27 23:00:03 +0100
commit2ef559c51361de8e40937f05e670f38fdb2c42cb (patch)
tree573faca858000563ad361080827040391a1c3dfe /pkgs
parent419413ac52d0c212915cf012d96744064c03b811 (diff)
downloadnixlib-2ef559c51361de8e40937f05e670f38fdb2c42cb.tar
nixlib-2ef559c51361de8e40937f05e670f38fdb2c42cb.tar.gz
nixlib-2ef559c51361de8e40937f05e670f38fdb2c42cb.tar.bz2
nixlib-2ef559c51361de8e40937f05e670f38fdb2c42cb.tar.lz
nixlib-2ef559c51361de8e40937f05e670f38fdb2c42cb.tar.xz
nixlib-2ef559c51361de8e40937f05e670f38fdb2c42cb.tar.zst
nixlib-2ef559c51361de8e40937f05e670f38fdb2c42cb.zip
systemd: Enable the firmware loader in udev
It's needed in kernels < 3.8.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index b1365a0ac07f..76769d4d3e65 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       "--with-dbuspolicydir=$(out)/etc/dbus-1/system.d"
       "--with-dbussystemservicedir=$(out)/share/dbus-1/system-services"
       "--with-dbussessionservicedir=$(out)/share/dbus-1/services"
-      "--with-firmware-path=/root/test-firmware:/var/run/current-system/firmware"
+      "--with-firmware-path=/root/test-firmware:/run/current-system/firmware"
       "--with-tty-gid=3" # tty in NixOS has gid 3
     ];
 
@@ -74,6 +74,8 @@ stdenv.mkDerivation rec {
       # Work around our kernel headers being too old.  FIXME: remove
       # this after the next stdenv update.
       "-DFS_NOCOW_FL=0x00800000"
+      # Enable udev's firmware builtin for now.
+      "-DENABLE_FIRMWARE=1"
     ];
 
   # Use /var/lib/udev rather than /etc/udev for the generated hardware