summary refs log tree commit diff
path: root/pkgs/games/steam/chrootenv.nix
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2016-01-27 00:45:21 +0300
committerNikolay Amiantov <ab@fmap.me>2016-01-27 00:58:23 +0300
commit5bbf10409ee2d2a5a8304e440067da6ad7e0277c (patch)
tree69b10d545c0890a4cd3f95e9677024b5998d2cfa /pkgs/games/steam/chrootenv.nix
parent9c6f3dcbcc52bbfdc98fff6ac781431e3244010d (diff)
downloadnixpkgs-5bbf10409ee2d2a5a8304e440067da6ad7e0277c.tar
nixpkgs-5bbf10409ee2d2a5a8304e440067da6ad7e0277c.tar.gz
nixpkgs-5bbf10409ee2d2a5a8304e440067da6ad7e0277c.tar.bz2
nixpkgs-5bbf10409ee2d2a5a8304e440067da6ad7e0277c.tar.lz
nixpkgs-5bbf10409ee2d2a5a8304e440067da6ad7e0277c.tar.xz
nixpkgs-5bbf10409ee2d2a5a8304e440067da6ad7e0277c.tar.zst
nixpkgs-5bbf10409ee2d2a5a8304e440067da6ad7e0277c.zip
steam: actually propagate flags to the runtime, now from chrootenv wrapper
Example: instead of

(steamPackages.override { newStdcpp = true; }).steam-chrootenv

(which wasn't working anyway) you now do just:

steam.override { newStdcpp = true; }
Diffstat (limited to 'pkgs/games/steam/chrootenv.nix')
-rw-r--r--pkgs/games/steam/chrootenv.nix11
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index fc0e70e4354..e6652d2f023 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,6 +1,9 @@
 { lib, buildFHSUserEnv, steam
-, withJava   ? false
+, withJava ? false
 , withPrimus ? false
+, nativeOnly ? false
+, runtimeOnly ? false
+, newStdcpp ? false
 }:
 
 buildFHSUserEnv {
@@ -20,7 +23,7 @@ buildFHSUserEnv {
       # Needed by gdialog, including in the steam-runtime
       perl
     ]
-    ++ lib.optional withJava   jdk
+    ++ lib.optional withJava jdk
     ++ lib.optional withPrimus primus
     ;
 
@@ -38,7 +41,9 @@ buildFHSUserEnv {
       gst_all_1.gst-plugins-ugly
       libdrm
 
-      steamPackages.steam-runtime-wrapped
+      (steamPackages.steam-runtime-wrapped.override {
+        inherit nativeOnly runtimeOnly newStdcpp;
+      })
     ];
 
   extraBuildCommands = ''