treewide: replace broken udev paths with systemd

This commit is contained in:
ners 2023-11-21 15:09:31 +01:00
parent 0b512d9245
commit ed31e0235e
5 changed files with 9 additions and 10 deletions

View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, lib, ... }:
with lib; with lib;
@ -49,7 +49,7 @@ with lib;
}; };
script = '' script = ''
${pkgs.udev}/bin/udevadm settle ${config.systemd.package}/bin/udevadm settle
echo -n 1 >/proc/sys/kernel/modules_disabled echo -n 1 >/proc/sys/kernel/modules_disabled
''; '';
}; };

View File

@ -77,7 +77,7 @@ in
serviceConfig = { serviceConfig = {
# Trigger the udev rule manually. This doesn't require replugging the # Trigger the udev rule manually. This doesn't require replugging the
# device when first enabling the option to get it to work # device when first enabling the option to get it to work
ExecStartPre = "${pkgs.udev}/bin/udevadm trigger -s usb -a idVendor=${apple}"; ExecStartPre = "${config.systemd.package}/bin/udevadm trigger -s usb -a idVendor=${apple}";
ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v"; ExecStart = "${cfg.package}/bin/usbmuxd -U ${cfg.user} -v";
}; };
}; };

View File

@ -11,7 +11,6 @@
, dbus , dbus
, cryptsetup , cryptsetup
, util-linux , util-linux
, udev
, lvm2 , lvm2
, systemd , systemd
, xfsprogs , xfsprogs
@ -53,7 +52,7 @@ stdenv.mkDerivation rec {
--replace stratis-min "$out/bin/stratis-min" \ --replace stratis-min "$out/bin/stratis-min" \
--replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ --replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \
--replace sleep "${coreutils}/bin/sleep" \ --replace sleep "${coreutils}/bin/sleep" \
--replace udevadm "${udev}/bin/udevadm" --replace udevadm "${systemd}/bin/udevadm"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -72,7 +71,7 @@ stdenv.mkDerivation rec {
dbus dbus
cryptsetup cryptsetup
util-linux util-linux
udev systemd
lvm2 lvm2
]; ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, python3, bluez { lib, stdenv, fetchurl, pkg-config, python3, bluez
, tcl, acl, kmod, coreutils, shadow, util-linux, udev , tcl, acl, kmod, coreutils, shadow, util-linux
, alsaSupport ? stdenv.isLinux, alsa-lib , alsaSupport ? stdenv.isLinux, alsa-lib
, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd
}: }:
@ -90,6 +90,6 @@ stdenv.mkDerivation rec {
) )
substituteInPlace $out/libexec/brltty/systemd-wrapper \ substituteInPlace $out/libexec/brltty/systemd-wrapper \
--replace 'logger' "${util-linux}/bin/logger" \ --replace 'logger' "${util-linux}/bin/logger" \
--replace 'udevadm' "${udev}/bin/udevadm" --replace 'udevadm' "${systemd}/bin/udevadm"
''; '';
} }

View File

@ -4,7 +4,7 @@ coreutils, # mktemp
grub2, # grub-mount and grub-probe grub2, # grub-mount and grub-probe
cryptsetup, # cryptsetup cryptsetup, # cryptsetup
libuuid, # blkid and blockdev libuuid, # blkid and blockdev
udev, # udevadm udevinfo systemd, # udevadm
ntfs3g, # ntfs3g ntfs3g, # ntfs3g
dmraid, # dmraid dmraid, # dmraid
lvm2 # lvs lvm2 # lvs
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
done; done;
for file in $out/bin/*; do for file in $out/bin/*; do
wrapProgram $file \ wrapProgram $file \
--suffix PATH : ${lib.makeBinPath [ grub2 udev coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \ --suffix PATH : ${lib.makeBinPath [ grub2 systemd coreutils cryptsetup libuuid ntfs3g lvm2 dmraid ]} \
--run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober" --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"
done; done;
''; '';