From a1440a679dc81f610d2083296031af9818754983 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 9 Mar 2015 23:01:32 +0300 Subject: [PATCH] primus: remove old workaround, fix LD_LIBRARY_PATH --- pkgs/tools/X11/primus/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index 684713bebb1..c5c0e3ce780 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -14,12 +14,7 @@ let ldPath = makeLibraryPath ([primusLib] ++ optional (primusLib_i686 != null) primusLib_i686); primusrun = writeScript "primusrun" '' - export LD_LIBRARY_PATH=${ldPath}:\$LD_LIBRARY_PATH - # see: https://github.com/amonakov/primus/issues/138 - # On my system, as of 3.16.6, the intel driver dies when the pixel buffers try to read from the - # source memory directly. Setting PRIMUS_UPLOAD causes an indirection through textures which - # avoids this issue. - export PRIMUS_UPLOAD=1 + export LD_LIBRARY_PATH=${ldPath}:$LD_LIBRARY_PATH exec "$@" ''; in