From baa07e7d78a86417fcf0d2da41e066752e565450 Mon Sep 17 00:00:00 2001
From: Andrey Arapov <andrey.arapov@nixaid.com>
Date: Sat, 6 Aug 2016 18:34:55 +0200
Subject: [PATCH] more fixes

---
 launch | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/launch b/launch
index 0b662b7..4620aa5 100644
--- a/launch
+++ b/launch
@@ -44,8 +44,10 @@ fi
 #
 # Make sure the Steam docker image's paths are coming first
 # and then the hosts's (/h1..20) mounted ones
-export LD_LIBRARY_PATH="/lib:/lib64:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20}_{32,64} | tr ' ' ':')"
-# GOOD export LD_LIBRARY_PATH="/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(echo /h{1..20}_{32,64} | tr ' ' ':')"
+export LD_LIBRARY_PATH="$(echo /h{1..20}_{32,64} | tr ' ' ':')"
+
+# Use libgcrypt provided by the Steam docker image
+export LD_PRELOAD="/lib/i386-linux-gnu/libgcrypt.so.11:/lib/x86_64-linux-gnu/libgcrypt.so.11"
 
 #
 # In order to avoid the inconsistency error, when launching `csgo_linux64`
@@ -53,6 +55,6 @@ export LD_LIBRARY_PATH="/lib:/lib64:/lib/i386-linux-gnu:/lib/x86_64-linux-gnu:$(
 # Hint: to find out what's wrong, use `strace`
 #
 # 1) openSUSE's libpulsecommon-7.0.so vs Ubuntu's libpulsecommon-5.0.so
-export LD_PRELOAD=$(find /h{1..20}_{32,64} -name "*libpulsecommon*" 2>/dev/null)
+export LD_PRELOAD="$LD_PRELOAD:$(find /h{1..20}_{32,64} -name "*libpulsecommon*" 2>/dev/null)"
 
 su -p user -c "steam $@"