diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2024-03-26 12:35:55 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-26 12:35:55 +0100 |
commit | 774dca168d26481e668979fb094d2e371c7707f3 (patch) | |
tree | 275e28c554b903e47075600ac69dbc0c1db75757 /nixos | |
parent | 6f414604e2a627ae3d8bc8f58573d8b50fb16829 (diff) | |
parent | 29a46d28027016dc9dbed88b7258306b35662158 (diff) |
Merge pull request #270465 from philiptaron/sideband-socket-path
nixos/nvidia: Set SidebandSocketPath to a user-writable path in `/run`
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/hardware/video/nvidia.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 3b983f768f91a..352c8d8ead54d 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -396,6 +396,9 @@ in { modules = [nvidia_x11.bin]; display = !offloadCfg.enable; deviceSection = + '' + Option "SidebandSocketPath" "/run/nvidia-xdriver/" + '' + lib.optionalString primeEnabled '' BusID "${pCfg.nvidiaBusId}" @@ -533,8 +536,14 @@ in { hardware.firmware = lib.optional cfg.open nvidia_x11.firmware; - systemd.tmpfiles.rules = - lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) + systemd.tmpfiles.rules = [ + # Remove the following log message: + # (WW) NVIDIA: Failed to bind sideband socket to + # (WW) NVIDIA: '/var/run/nvidia-xdriver-b4f69129' Permission denied + # + # https://bbs.archlinux.org/viewtopic.php?pid=1909115#p1909115 + "d /run/nvidia-xdriver 0770 root users" + ] ++ lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; boot = { |