Revert "Merge pull request #32721 from yegortimoshenko/steam/13-dec"

This reverts commit 6778ee3, reversing changes made to 711379f. #32721 (comment) steam-runtime-wrapped is not yet available on the release branch.
NixOS · Dec 15, 2017 · c1d1ef6 · c1d1ef6
1 parent 6778ee3
commit c1d1ef6
Showing 1 changed file with 14 additions and 26 deletions.
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
@@ -36,20 +36,6 @@ let
       ++ lib.optional withPrimus primus
       ++ extraPkgs pkgs;
 
-  ldPath = map (x: "/steamrt/${steam-runtime-wrapped.arch}/" + x) steam-runtime-wrapped.libs
-           ++ lib.optionals (steam-runtime-wrapped-i686 != null) (map (x: "/steamrt/${steam-runtime-wrapped-i686.arch}/" + x) steam-runtime-wrapped-i686.libs);
-
-  runSh = writeScript "run.sh" ''
-    #!${stdenv.shell}
-    runtime_paths="${lib.concatStringsSep ":" ldPath}"
-    if [ "$1" == "--print-steam-runtime-library-paths" ]; then
-      echo "$runtime_paths"
-      exit 0
-    fi
-    export LD_LIBRARY_PATH="$runtime_paths:$LD_LIBRARY_PATH"
-    exec "$@"
-  '';
-
 in buildFHSUserEnv rec {
   name = "steam";
 
@@ -87,7 +73,6 @@ in buildFHSUserEnv rec {
     ${lib.optionalString (steam-runtime-i686 != null) ''
       ln -s ../lib32/steam-runtime steamrt/${steam-runtime-i686.arch}
     ''}
-    ln -s ${runSh} steamrt/run.sh
   '';
 
   extraInstallCommands = ''
@@ -110,16 +95,19 @@ in buildFHSUserEnv rec {
     targetPkgs = commonTargetPkgs;
     inherit multiPkgs extraBuildCommands;
 
-    runScript = writeScript "steam-run" ''
-      #!${stdenv.shell}
-      run="$1"
-      if [ "$run" = "" ]; then
-        echo "Usage: steam-run command-to-run args..." >&2
-        exit 1
-      fi
-      shift
-      export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
-      exec "$run" "$@"
-    '';
+    runScript =
+      let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs
+                 ++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs);
+      in writeScript "steam-run" ''
+        #!${stdenv.shell}
+        run="$1"
+        if [ "$run" = "" ]; then
+          echo "Usage: steam-run command-to-run args..." >&2
+          exit 1
+        fi
+        shift
+        export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
+        exec "$run" "$@"
+      '';
   };
 }