Author: viric
Date: Tue Jul 13 19:12:42 2010
New Revision: 22586
URL: https://svn.nixos.org/websvn/nix/?rev=22586&sc=1
Log:
Fixing virtualgl for 'vglrun' to work fine and simple, under xproxy (like
tigervnc).
Modified:
nixpkgs/trunk/pkgs/tools/X11/virtualgl/default.nix
Modified: nixpkgs/trunk/pkgs/tools/X11/virtualgl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/X11/virtualgl/default.nix Tue Jul 13 18:06:17
2010 (r22585)
+++ nixpkgs/trunk/pkgs/tools/X11/virtualgl/default.nix Tue Jul 13 19:12:42
2010 (r22586)
@@ -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 @@
patches = [ ./xshm.patch ];
+ prePatch = ''
+ sed -i s,LD_PRELOAD=lib,LD_PRELOAD=$out/${libDir}/lib, rr/vglrun
+ '';
+
preInstall =''
export makeFlags="prefix=$out"
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
