diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-03 20:52:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-04 10:03:53 +0200 |
commit | b44d846990d779f7201f114076a2f2bcacdc91c5 (patch) | |
tree | 9a6f766bfb04765e1095be811aab38b94f88bd5d /nixos/modules/system | |
parent | ec7a4ddd92e19e0084a07448671cd79d974cd818 (diff) | |
download | nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.gz nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.bz2 nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.lz nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.xz nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.tar.zst nixlib-b44d846990d779f7201f114076a2f2bcacdc91c5.zip |
udev: complete rework
- systemd puts all into one output now (except for man), because I wasn't able to fix all systemd/udev refernces for NixOS to work well - libudev is now by default *copied* into another path, which is what most packages will use as build input :-) - pkgs.udev = [ libudev.out libudev.dev ]; because there are too many references that just put `udev` into build inputs (to rewrite them all), also this made "${udev}/foo" fail at *evaluation* time so it's easier to catch and change to something more specific
Diffstat (limited to 'nixos/modules/system')
-rw-r--r-- | nixos/modules/system/boot/stage-1.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 6b722c4e1105..0759b10c00a5 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -60,9 +60,9 @@ let copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm # Copy udev. - copy_bin_and_libs ${udev.out}/lib/systemd/systemd-udevd - copy_bin_and_libs ${udev.out}/bin/udevadm - for BIN in ${udev.libudev}/lib/udev/*_id; do + copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd + copy_bin_and_libs ${udev}/bin/udevadm + for BIN in ${udev}/lib/udev/*_id; do copy_bin_and_libs $BIN done @@ -146,9 +146,9 @@ let echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules - cp -v ${udev.out}/lib/udev/rules.d/60-cdrom_id.rules $out/ - cp -v ${udev.out}/lib/udev/rules.d/60-persistent-storage.rules $out/ - cp -v ${udev.out}/lib/udev/rules.d/80-drivers.rules $out/ + cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/ + cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/ + cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/ cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/ ${config.boot.initrd.extraUdevRulesCommands} |