summary refs log tree commit diff
diff options
context:
space:
mode:
authorTimothy DeHerrera <tim.deh@pm.me>2023-10-24 13:58:22 -0600
committerGitHub <noreply@github.com>2023-10-24 13:58:22 -0600
commitf06b975898c1e423bd082f477738381af4a3a449 (patch)
treeb8cf58685d3142fc49c566eaa5acf25bbdbf93eb
parent10cf70c64403fac0abfb6d232942c4791d4732a2 (diff)
parente24d43a18c99138b782fea2d00337e34539e360b (diff)
downloadnixpkgs-f06b975898c1e423bd082f477738381af4a3a449.tar
nixpkgs-f06b975898c1e423bd082f477738381af4a3a449.tar.gz
nixpkgs-f06b975898c1e423bd082f477738381af4a3a449.tar.bz2
nixpkgs-f06b975898c1e423bd082f477738381af4a3a449.tar.lz
nixpkgs-f06b975898c1e423bd082f477738381af4a3a449.tar.xz
nixpkgs-f06b975898c1e423bd082f477738381af4a3a449.tar.zst
nixpkgs-f06b975898c1e423bd082f477738381af4a3a449.zip
Merge pull request #262135 from Kiskae/nvidia-udev-fix
nixos/nvidia: partially revert #181674
-rw-r--r--nixos/modules/hardware/video/nvidia.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 4320edf60da..c36775dd24b 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -269,9 +269,9 @@ in {
         services.udev.extraRules =
         ''
           # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
-          KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 255'"
-          KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \  -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \  -f 1) $${i}; done'"
-          KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \  -f 1) 254'"
+          KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'"
+          KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \  -f 4); do mknod -m 666 /dev/nvidia$${i} c 195 $${i}; done'"
+          KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'"
           KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"
           KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 1'"
         '';