From a1440a679dc81f610d2083296031af9818754983 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 9 Mar 2015 23:01:32 +0300
Subject: [PATCH 1/2] 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

From c16188343af7192bd51971ca07b5b4b00ed7b952 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 9 Mar 2015 23:01:43 +0300
Subject: [PATCH 2/2] steam: add primus support

---
 pkgs/games/steam/chrootenv.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index d66a2a2ab69..b4019f86e30 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,4 +1,4 @@
-{ buildFHSUserEnv, config }:
+{ lib, buildFHSUserEnv, config }:
 
 buildFHSUserEnv {
   name = "steam";
@@ -14,7 +14,8 @@ buildFHSUserEnv {
       pkgs.gnome2.zenity
       pkgs.xdg_utils
     ]
-    ++ (if config.steam.java or false then [ pkgs.jdk ] else [ ])
+    ++ lib.optional (config.steam.java or false) pkgs.jdk
+    ++ lib.optional (config.steam.primus or false) pkgs.primus
     ;
 
   multiPkgs = pkgs: