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 /pkgs/misc/drivers/foo2zjs | |
| parent | ec7a4ddd92e19e0084a07448671cd79d974cd818 (diff) | |
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 'pkgs/misc/drivers/foo2zjs')
| -rw-r--r-- | pkgs/misc/drivers/foo2zjs/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index 83546b44198a..2547baec4f12 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -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'' |