about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-04 09:59:33 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2008-06-04 09:59:33 +0000
commit9029c3b61f32fa61145689cf537ca9a552e1ba50 (patch)
treeb25b7819d9da6c0b1a1ef071640ac41c3b24a468 /pkgs/top-level
parentdcf01e5925d82c8bf19b04f2afb99bc6d822d8ef (diff)
downloadnixlib-9029c3b61f32fa61145689cf537ca9a552e1ba50.tar
nixlib-9029c3b61f32fa61145689cf537ca9a552e1ba50.tar.gz
nixlib-9029c3b61f32fa61145689cf537ca9a552e1ba50.tar.bz2
nixlib-9029c3b61f32fa61145689cf537ca9a552e1ba50.tar.lz
nixlib-9029c3b61f32fa61145689cf537ca9a552e1ba50.tar.xz
nixlib-9029c3b61f32fa61145689cf537ca9a552e1ba50.tar.zst
nixlib-9029c3b61f32fa61145689cf537ca9a552e1ba50.zip
* NVIDIA driver: set a RUNPATH on libGL.so and friends. This ensures
  that applications that link against it don't need to have its
  dependencies (like libXext) in *their* RUNPATHs.
* glxinfo: don't add /var/run/opengl-driver/lib to the RUNPATH.
  Instead LD_LIBRARY_PATH should be set to
  /var/run/opengl-driver/lib at runtime.  This is much more pure, and
  it obviates the need for patchelfing all OpenGL applications.
  (TODO: remove patchelf hacks for other OpenGL programs as well.)

svn path=/nixpkgs/branches/stdenv-updates/; revision=11972
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix3
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae7ce1ed071f..9e2145fa4985 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -558,7 +558,6 @@ rec {
 
   glxinfo = assert mesaSupported; import ../tools/graphics/glxinfo {
     inherit fetchurl stdenv x11 mesa;
-    inherit (xlibs) libXext;
   };
 
   gnugrep = useFromStdenv "gnugrep"
@@ -4288,7 +4287,7 @@ rec {
   };
 
   nvidiaDrivers = import ../os-specific/linux/nvidia {
-    inherit stdenv fetchurl kernel xlibs gtkLibs;
+    inherit stdenv fetchurl kernel xlibs gtkLibs zlib;
   };
 
   gw6c = import ../os-specific/linux/gw6c {