about summary refs log tree commit diff
path: root/nixos/modules/hardware
diff options
context:
space:
mode:
authorAidan Gauland <aidalgol@fastmail.net>2024-06-03 10:11:26 +1200
committerAidan Gauland <aidalgol@fastmail.net>2024-06-08 08:00:55 +1200
commit19960c426dc6797ec7341a04ee3287bb29f95c08 (patch)
tree049e6d48611d2b8a09008bedf0ab96ff3feede02 /nixos/modules/hardware
parentec6dd23a30fc2f764622a2d259c0c8f42415ce4b (diff)
downloadnixlib-19960c426dc6797ec7341a04ee3287bb29f95c08.tar
nixlib-19960c426dc6797ec7341a04ee3287bb29f95c08.tar.gz
nixlib-19960c426dc6797ec7341a04ee3287bb29f95c08.tar.bz2
nixlib-19960c426dc6797ec7341a04ee3287bb29f95c08.tar.lz
nixlib-19960c426dc6797ec7341a04ee3287bb29f95c08.tar.xz
nixlib-19960c426dc6797ec7341a04ee3287bb29f95c08.tar.zst
nixlib-19960c426dc6797ec7341a04ee3287bb29f95c08.zip
nixos/nvidia: revert libXNVCtrl changes
This library does not actually need to match the Nvidia driver version,
so we do not need to make it available impurely.

This reverts the following commits.
9b3461e7ae40cfab93ff21e5ca263b97fa05888e
4e353b67f667766b1c6489f23c20b920ab0c82f5
Diffstat (limited to 'nixos/modules/hardware')
-rw-r--r--nixos/modules/hardware/video/nvidia.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 2091d45d494b..3caec769400c 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -285,7 +285,7 @@ in
             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'"
           '';
           hardware.opengl = {
-            extraPackages = [ nvidia_x11.out ] ++ (lib.optional (builtins.hasAttr "libXNVCtrl" nvidia_x11.settings) nvidia_x11.settings.libXNVCtrl);
+            extraPackages = [ nvidia_x11.out ];
             extraPackages32 = [ nvidia_x11.lib32 ];
           };
           environment.systemPackages = [ nvidia_x11.bin ];