From cdc84fcc96b0608021937393a1230242882043d5 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Sat, 4 Jan 2025 00:52:03 +0200 Subject: [PATCH 1/2] udev: substitute /usr/bin/cat in rules Used by alsa-utils 1.2.13. --- nixos/modules/services/hardware/udev.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 0d6c78cf29c4..fe08a472bbae 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -66,6 +66,7 @@ let --replace \"/sbin/blkid \"${pkgs.util-linux}/sbin/blkid \ --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \ --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \ + --replace /usr/bin/cat ${pkgs.coreutils}/bin/cat \ --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename 2>/dev/null ${lib.optionalString (initrdBin != null) '' substituteInPlace $i --replace '/run/current-system/systemd' "${lib.removeSuffix "/bin" initrdBin}" From b758495e5d02b0fcc3109c574b5fb68e70ba5c32 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Sun, 5 Jan 2025 17:28:42 +0200 Subject: [PATCH 2/2] udev: "--replace" -> "--replace-quiet" in substitutions "--replace" is deprecated, and neither vocal new alternative is appropriate in this case. --- nixos/modules/services/hardware/udev.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index fe08a472bbae..ab6c3fe46f7a 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -61,15 +61,15 @@ let # Fix some paths in the standard udev rules. Hacky. for i in $out/*.rules; do substituteInPlace $i \ - --replace \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \ - --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \ - --replace \"/sbin/blkid \"${pkgs.util-linux}/sbin/blkid \ - --replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \ - --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \ - --replace /usr/bin/cat ${pkgs.coreutils}/bin/cat \ - --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename 2>/dev/null + --replace-quiet \"/sbin/modprobe \"${pkgs.kmod}/bin/modprobe \ + --replace-quiet \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \ + --replace-quiet \"/sbin/blkid \"${pkgs.util-linux}/sbin/blkid \ + --replace-quiet \"/bin/mount \"${pkgs.util-linux}/bin/mount \ + --replace-quiet /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \ + --replace-quiet /usr/bin/cat ${pkgs.coreutils}/bin/cat \ + --replace-quiet /usr/bin/basename ${pkgs.coreutils}/bin/basename 2>/dev/null ${lib.optionalString (initrdBin != null) '' - substituteInPlace $i --replace '/run/current-system/systemd' "${lib.removeSuffix "/bin" initrdBin}" + substituteInPlace $i --replace-quiet '/run/current-system/systemd' "${lib.removeSuffix "/bin" initrdBin}" ''} done