From 1b69894d744f855857df9ff1589d95da3af573db Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 10 Nov 2015 23:59:57 +0300
Subject: [PATCH] fhs-env: symlink /usr/lib to libs for the main architecture

---
 pkgs/build-support/build-fhs-chrootenv/env.nix | 9 ++++++---
 pkgs/games/steam/chrootenv.nix                 | 4 +---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix
index 4c307a77d126..a8293ea803cc 100644
--- a/pkgs/build-support/build-fhs-chrootenv/env.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/env.nix
@@ -54,8 +54,8 @@ let
 
   etcProfile = nixpkgs.writeText "profile" ''
     export PS1='${name}-chrootenv:\u@\h:\w\$ '
-    export LOCALE_ARCHIVE='/usr/lib${if isMultiBuild then "64" else ""}/locale/locale-archive'
-    export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib64
+    export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive'
+    export LD_LIBRARY_PATH='/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32'
     export PATH='/usr/bin:/usr/sbin'
     ${profile}
   '';
@@ -129,7 +129,7 @@ let
   setupLibDirs_multi = ''
     mkdir -m0755 lib32
     mkdir -m0755 lib64
-    ln -s lib32 lib
+    ln -s lib64 lib
 
     # copy glibc stuff
     cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ && chmod u+w -R lib32/
@@ -149,6 +149,9 @@ let
     # copy gcc libs
     cp -rsHf ${chosenGcc.cc}/lib/*   lib32/
     cp -rsHf ${chosenGcc.cc}/lib64/* lib64/
+
+    # symlink 32-bit ld-linux.so
+    ln -s ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/
   '';
 
   setupLibDirs = if isTargetBuild then setupLibDirs_target
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 6028883c3633..1152d48bdd85 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -40,12 +40,10 @@ buildFHSUserEnv {
     ];
 
   extraBuildCommands = ''
-    [ -d lib64 ] && mv lib64/steam lib
-
     mkdir -p steamrt
 
     ln -s ../lib64/steam-runtime steamrt/amd64
-    ln -s ../lib/steam-runtime steamrt/i386
+    ln -s ../lib32/steam-runtime steamrt/i386
   '';
 
   profile = ''