summary refs log tree commit diff
path: root/pkgs/os-specific/linux/nvidia-x11
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2009-06-16 12:51:35 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2009-06-16 12:51:35 +0000
commit49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f (patch)
tree8c8c9e816a57acee3c60f4d920b257acafc8b45f /pkgs/os-specific/linux/nvidia-x11
parentb7032e7fc436150b3401809070bddfad3348715f (diff)
downloadnixlib-49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f.tar
nixlib-49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f.tar.gz
nixlib-49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f.tar.bz2
nixlib-49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f.tar.lz
nixlib-49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f.tar.xz
nixlib-49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f.tar.zst
nixlib-49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f.zip
* Work around a bizarre bug that causes nvidia-settings to be able to
  find libXrandr when invoked as "nvidia-settings", but not when
  invoked by absolute path
  (e.g. "/var/run/current-system/sw/bin/nvidia-settings").  Adding it
  to libGL's RUNPATH fixes this.  Strangely, libGL doesn't even
  contain a reference to libXrandr.

svn path=/nixpkgs/trunk/; revision=15971
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index cfe69b7bab45..dde908024d9f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -28,13 +28,13 @@ stdenv.mkDerivation {
 
   dontStrip = true;
 
-  glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11];
+  glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr];
 
   cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc];
 
   programPath = stdenv.lib.makeLibraryPath [
     gtkLibs.gtk gtkLibs.atk gtkLibs.pango gtkLibs.glib
-    xlibs.libXv xlibs.libXrandr
+    xlibs.libXv
   ];
 
   meta = {