diff options
author | ners <ners@gmx.ch> | 2023-11-21 15:09:31 +0100 |
---|---|---|
committer | ners <ners@gmx.ch> | 2023-11-21 15:09:38 +0100 |
commit | ed31e0235e97a20ab013c3f1c3fed04041cd146e (patch) | |
tree | 43a25f0b8c43d87f61510065dfb29b123f079a99 /pkgs | |
parent | 0b512d9245c8754d0a03f7e205b5e56e139bb396 (diff) |
treewide: replace broken udev paths with systemd
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/filesystems/stratisd/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/misc/brltty/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/os-prober/default.nix | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 707b3ac654e4a..bd8d4e89dd011 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -11,7 +11,6 @@ , dbus , cryptsetup , util-linux -, udev , lvm2 , systemd , xfsprogs @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { --replace stratis-min "$out/bin/stratis-min" \ --replace systemd-ask-password "${systemd}/bin/systemd-ask-password" \ --replace sleep "${coreutils}/bin/sleep" \ - --replace udevadm "${udev}/bin/udevadm" + --replace udevadm "${systemd}/bin/udevadm" ''; nativeBuildInputs = [ @@ -72,7 +71,7 @@ stdenv.mkDerivation rec { dbus cryptsetup util-linux - udev + systemd lvm2 ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 5838c24172f8e..f9b3ec3f73ac2 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,5 +1,5 @@ { 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 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd }: @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { ) substituteInPlace $out/libexec/brltty/systemd-wrapper \ --replace 'logger' "${util-linux}/bin/logger" \ - --replace 'udevadm' "${udev}/bin/udevadm" + --replace 'udevadm' "${systemd}/bin/udevadm" ''; } diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index b38cb81748a65..5d15b7077385b 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -4,7 +4,7 @@ coreutils, # mktemp grub2, # grub-mount and grub-probe cryptsetup, # cryptsetup libuuid, # blkid and blockdev -udev, # udevadm udevinfo +systemd, # udevadm ntfs3g, # ntfs3g dmraid, # dmraid lvm2 # lvs @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { done; for file in $out/bin/*; do 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" done; ''; |