diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/games/steam/chrootenv.nix | 11 | ||||
-rw-r--r-- | pkgs/games/steam/default.nix | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index fc0e70e43549..e6652d2f0239 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 = '' diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index dd02903dcb28..64f8cfe2c287 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,17 +1,11 @@ -{ pkgs, newScope -, nativeOnly ? false -, runtimeOnly ? false -, newStdcpp ? false -}: +{ pkgs, newScope }: let callPackage = newScope self; self = rec { steam-runtime = callPackage ./runtime.nix { }; - steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { - inherit nativeOnly runtimeOnly newStdcpp; - }; + steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam = callPackage ./steam.nix { }; steam-chrootenv = callPackage ./chrootenv.nix { }; steam-fonts = callPackage ./fonts.nix { }; |