summary refs log tree commit diff
path: root/pkgs/games/steam/chrootenv.nix
diff options
context:
space:
mode:
authorSarah Brofeldt <sbrofeldt@gmail.com>2017-09-10 10:54:06 +0200
committerSarah Brofeldt <sbrofeldt@gmail.com>2017-09-10 10:54:06 +0200
commit734a04800a3b370ab8ce83533d3f8ff14a0c9b3a (patch)
treeaf5e72120b75e089a52dd0aeac27aecc2c6a69e2 /pkgs/games/steam/chrootenv.nix
parent799435b7cab97a39893a104999b3bc589e1172b1 (diff)
downloadnixpkgs-734a04800a3b370ab8ce83533d3f8ff14a0c9b3a.tar
nixpkgs-734a04800a3b370ab8ce83533d3f8ff14a0c9b3a.tar.gz
nixpkgs-734a04800a3b370ab8ce83533d3f8ff14a0c9b3a.tar.bz2
nixpkgs-734a04800a3b370ab8ce83533d3f8ff14a0c9b3a.tar.lz
nixpkgs-734a04800a3b370ab8ce83533d3f8ff14a0c9b3a.tar.xz
nixpkgs-734a04800a3b370ab8ce83533d3f8ff14a0c9b3a.tar.zst
nixpkgs-734a04800a3b370ab8ce83533d3f8ff14a0c9b3a.zip
steam: Get rid of newStdcpp option, always on
Diffstat (limited to 'pkgs/games/steam/chrootenv.nix')
-rw-r--r--pkgs/games/steam/chrootenv.nix9
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index ace8e9888a7..0c59821bdd2 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/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;
     })
   ];