From 4115132dfe71e5604d5218526cba2d94c34cac1b Mon Sep 17 00:00:00 2001
From: useranon350 <155507401+useranon350@users.noreply.github.com>
Date: Sun, 15 Dec 2024 17:07:20 -0500
Subject: [PATCH] nvidia-settings: add libraries to runpath (#318131)

* Add runtime dependencies to nvidia-settings runpath.

* Move libXv to runtimeDependencies nvidia-x11 settings.
---
 pkgs/os-specific/linux/nvidia-x11/settings.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index df05a859b4c9..f1b363f5a696 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -17,6 +17,7 @@ nvidia_x11: sha256:
 , libXxf86vm
 , libvdpau
 , librsvg
+, libglvnd
 , wrapGAppsHook3
 , addDriverRunpath
 , withGtk2 ? false
@@ -77,6 +78,12 @@ let
     };
   };
 
+  runtimeDependencies = [
+    libglvnd libXrandr libXv
+  ];
+
+  runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
+
 in
 
 stdenv.mkDerivation {
@@ -143,7 +150,7 @@ stdenv.mkDerivation {
 
   binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings";
   postFixup = ''
-    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
+    patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${runtimeLibraryPath}" \
       $out/bin/$binaryName
 
     addDriverRunpath $out/bin/$binaryName