From 7bf20213497193695f16f3222a4409e72be52b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 21 Feb 2015 17:25:43 +0100
Subject: [PATCH] nvidia_x11: reintroduce libXv for nvidia-settings

It was dropped in 77986803a6.
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 2 +-
 pkgs/os-specific/linux/nvidia-x11/default.nix | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 314b1082dfc..41523b93167 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -75,7 +75,7 @@ installPhase() {
         for i in nvidia-settings nvidia-smi; do
             cp $i $out/bin/$i
             patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                --set-rpath $out/lib:$glPath $out/bin/$i
+                --set-rpath $out/lib:$programPath:$glPath $out/bin/$i
         done
 
         patchelf --set-rpath $glPath:$gtk3Path $out/lib/libnvidia-gtk3.so.*.*
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 5dd8eb5450c..f62649e2daa 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -49,6 +49,7 @@ stdenv.mkDerivation {
   # we don't support the gtk2 version
   gtk3Path = optionalString (!libsOnly) (makeLibraryPath
     [ gtk3 atk pango glib gdk_pixbuf cairo ] );
+  programPath = makeLibraryPath [ xlibs.libXv ];
 
   buildInputs = [ perl ];