Merge pull request #29180 from srhb/nixos-unstable

steam: Get rid of newStdcpp option, always on

pkgs/games/steam/chrootenv.nix

@@ -5,16 +5,11 @@
 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
 , nativeOnly ? false
 , runtimeOnly ? false
-, newStdcpp ? false
 }:
 
 let
   commonTargetPkgs = pkgs: with pkgs;
     let
-      primus2 = if newStdcpp then primus else primus.override {
-        stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
-        stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
-      };
       tzdir = "${pkgs.tzdata}/share/zoneinfo";
       # I'm not sure if this is the best way to add things like this
       # to an FHSUserEnv
@@ -38,7 +33,7 @@ let
       # Zoneinfo
       etc-zoneinfo
     ] ++ lib.optional withJava jdk
-      ++ lib.optional withPrimus primus2
+      ++ lib.optional withPrimus primus
       ++ extraPkgs pkgs;
 
 in buildFHSUserEnv rec {
@@ -68,7 +63,7 @@ in buildFHSUserEnv rec {
     xlibs.libpciaccess
 
     (steamPackages.steam-runtime-wrapped.override {
-      inherit nativeOnly runtimeOnly newStdcpp;
+      inherit nativeOnly runtimeOnly;
     })
   ];
 

pkgs/games/steam/runtime-wrapped.nix

@@ -1,11 +1,9 @@
 { stdenv, lib, perl, pkgs, steam-runtime
 , nativeOnly ? false
 , runtimeOnly ? false
-, newStdcpp ? false
 }:
 
 assert !(nativeOnly && runtimeOnly);
-assert newStdcpp -> !runtimeOnly;
 
 let 
   runtimePkgs = with pkgs; [
@@ -79,7 +77,7 @@ let
     SDL2_mixer
     gstreamer
     gst-plugins-base
-  ] ++ lib.optional (!newStdcpp) gcc48.cc;
+  ];
 
   overridePkgs = with pkgs; [
     libgpgerror
@@ -88,7 +86,8 @@ let
     openalSoft
     libva
     vulkan-loader
-  ] ++ lib.optional newStdcpp gcc.cc;
+    gcc.cc
+  ];
 
   ourRuntime = if runtimeOnly then []
                else if nativeOnly then runtimePkgs ++ overridePkgs