Merge pull request #300995 from SuperSandro2000/udev-nixos-wsl (38142559) · Commits · nix / nixpkgs

nixos/modules/services/hardware/udev.nix

+22 −24

Original line number	Diff line number	Diff line
		@@ -401,8 +401,7 @@ in
		}))
		];

		environment.etc =
		{
		environment.etc = {
		"udev/rules.d".source = udevRulesFor {
		name = "udev-rules";
		udevPackages = cfg.packages;
		@@ -411,6 +410,9 @@ in
		inherit udevPath udev;
		};
		"udev/hwdb.bin".source = hwdbBin;
		} // lib.optionalAttrs config.boot.modprobeConfig.enable {
		# We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat.
		"modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware";
		};

		system.requiredKernelConfig = with config.lib.kernelConfig; [
		@@ -419,11 +421,7 @@ in
		(isYes "NET")
		];

		# We don't place this into `extraModprobeConfig` so that stage-1 ramdisk doesn't bloat.
		environment.etc."modprobe.d/firmware.conf".text = "options firmware_class path=${config.hardware.firmware}/lib/firmware";

		system.activationScripts.udevd =
		''
		system.activationScripts.udevd = lib.mkIf config.boot.kernel.enable ''
		# The deprecated hotplug uevent helper is not used anymore
		if [ -e /proc/sys/kernel/hotplug ]; then
		echo "" > /proc/sys/kernel/hotplug