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
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
x@{builderDefsPackage
|
||||
, foomatic_filters, bc, unzip, ghostscript, udev, vim
|
||||
, foomatic_filters, bc, unzip, ghostscript, systemd, vim
|
||||
, ...}:
|
||||
builderDefsPackage
|
||||
(a :
|
||||
@@ -36,7 +36,7 @@ rec {
|
||||
''PIXMAPS=$out/share/pixmaps''
|
||||
''UDEVBIN=$out/bin''
|
||||
''UDEVDIR=$out/etc/udev/rules.d''
|
||||
''UDEVD=${udev.out}/sbin/udevd''
|
||||
''UDEVD=${systemd.udev.bin}/sbin/udevd''
|
||||
''LIBUDEVDIR=$out/lib/udev/rules.d''
|
||||
''USBDIR=$out/etc/hotplug/usb''
|
||||
''FOODB=$out/share/foomatic/db/source''
|
||||
|
||||
Reference in New Issue
Block a user