Merge pull request #30872 from FRidh/udev

systemd: remove udev attributes

authored by Frederik Rietdijk and committed by GitHub decaeb30 ae230842

+3 -7
+1 -1
pkgs/misc/drivers/foo2zjs/default.nix
··· 18 18 "PIXMAPS=$(out)/share/pixmaps" 19 19 "UDEVBIN=$(out)/bin" 20 20 "UDEVDIR=$(out)/etc/udev/rules.d" 21 - "UDEVD=${systemd.udev.bin}/sbin/udevd" 21 + "UDEVD=${systemd}/sbin/udevd" 22 22 "LIBUDEVDIR=$(out)/lib/udev/rules.d" 23 23 "USBDIR=$(out)/etc/hotplug/usb" 24 24 "FOODB=$(out)/share/foomatic/db/source"
+1 -1
pkgs/os-specific/linux/lvm2/default.nix
··· 28 28 preConfigure = 29 29 '' 30 30 substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ 31 - --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm 31 + --replace /usr/bin/udevadm ${systemd}/bin/udevadm 32 32 33 33 sed -i /DEFAULT_SYS_DIR/d Makefile.in 34 34 sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
+1 -5
pkgs/top-level/all-packages.nix
··· 12975 12975 12976 12976 systemd = callPackage ../os-specific/linux/systemd { 12977 12977 utillinux = utillinuxMinimal; # break the cyclic dependency 12978 - } 12979 - // { 12980 - udev.bin = systemd; # ${systemd.udev.bin}/bin/udevadm 12981 - udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.* 12982 - }; 12978 + }; 12983 12979 12984 12980 # standalone cryptsetup generator for systemd 12985 12981 systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { };