Merge branch 'staging-next' into staging

pkgs/games/0verkill/default.nix

@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, gccStdenv
 , fetchFromGitHub
 , autoreconfHook
 , xorgproto
@@ -7,7 +7,7 @@
 , libXpm
 }:
 
-stdenv.mkDerivation rec {
+gccStdenv.mkDerivation rec {
   pname = "0verkill";
   version = "unstable-2011-01-13";
 

pkgs/games/steam-tui/default.nix

@@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec {
     mv $out/bin/steam-tui $out/bin/.steam-tui-unwrapped
     cat > $out/bin/steam-tui <<EOF
     #!${runtimeShell}
-    exec steam-run $out/bin/.steam-tui-unwrapped '$@'
+    export PATH=${steamcmd}/bin:\$PATH
+    exec ${steam-run-native}/bin/steam-run $out/bin/.steam-tui-unwrapped '\$@'
     EOF
     chmod +x $out/bin/steam-tui
   '';