systemd: remove udev attributes
This commit is contained in:
parent
66b63d2f5a
commit
97c7b69e25
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
|||
"PIXMAPS=$(out)/share/pixmaps"
|
||||
"UDEVBIN=$(out)/bin"
|
||||
"UDEVDIR=$(out)/etc/udev/rules.d"
|
||||
"UDEVD=${systemd.udev.bin}/sbin/udevd"
|
||||
"UDEVD=${systemd}/sbin/udevd"
|
||||
"LIBUDEVDIR=$(out)/lib/udev/rules.d"
|
||||
"USBDIR=$(out)/etc/hotplug/usb"
|
||||
"FOODB=$(out)/share/foomatic/db/source"
|
||||
|
|
|
@ -28,7 +28,7 @@ stdenv.mkDerivation {
|
|||
preConfigure =
|
||||
''
|
||||
substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
|
||||
--replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm
|
||||
--replace /usr/bin/udevadm ${systemd}/bin/udevadm
|
||||
|
||||
sed -i /DEFAULT_SYS_DIR/d Makefile.in
|
||||
sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
|
||||
|
|
|
@ -12956,11 +12956,7 @@ with pkgs;
|
|||
|
||||
systemd = callPackage ../os-specific/linux/systemd {
|
||||
utillinux = utillinuxMinimal; # break the cyclic dependency
|
||||
}
|
||||
// {
|
||||
udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm
|
||||
udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.*
|
||||
};
|
||||
};
|
||||
|
||||
# standalone cryptsetup generator for systemd
|
||||
systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { };
|
||||
|
|
Loading…
Reference in a new issue