From d0f681d6573a4a56527bfbc2cf0e08a0c16b6d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 13 Jul 2010 19:12:42 +0000 Subject: [PATCH] Fixing virtualgl for 'vglrun' to work fine and simple, under xproxy (like tigervnc). svn path=/nixpkgs/trunk/; revision=22586 --- pkgs/tools/X11/virtualgl/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix index 42d70251d5d..433c22d128d 100644 --- a/pkgs/tools/X11/virtualgl/default.nix +++ b/pkgs/tools/X11/virtualgl/default.nix @@ -1,5 +1,8 @@ {stdenv, fetchurl, mesa, libX11, openssl, libXext, libjpeg_turbo}: +let + libDir = if stdenv.is64bit then "lib64" else "lib"; +in stdenv.mkDerivation { name = "virtualgl-2.1.4"; src = fetchurl { @@ -9,6 +12,10 @@ stdenv.mkDerivation { patches = [ ./xshm.patch ]; + prePatch = '' + sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/${libDir}/lib, rr/vglrun + ''; + preInstall ='' export makeFlags="prefix=$out" '';