From 49d141ed018d42ff0c7aa527b3ae4cdc0bea8c2f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 16 Jun 2009 12:51:35 +0000 Subject: [PATCH] * 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 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 4 ++-- 1 file 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 = {