diff options
author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:30 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:33:30 +0000 |
commit | 1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe (patch) | |
tree | 523655e6418b5bc7cdf779e5e3163dec032ce0f3 | |
parent | c7675be3c1ba12b02d3a6044a47bc0c86f240e8e (diff) | |
download | nixpkgs-1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe.tar nixpkgs-1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe.tar.gz nixpkgs-1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe.tar.bz2 nixpkgs-1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe.tar.lz nixpkgs-1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe.tar.xz nixpkgs-1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe.tar.zst nixpkgs-1a69c20e60bbe5b64fcb37e207ee7e0ed2f5b2fe.zip |
steam: move defaults to package file
-rw-r--r-- | pkgs/games/steam/chrootenv.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index c31b8b22216..17f25e25e3f 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,11 +1,13 @@ -{ stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 +{ config, stdenv, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null -, withJava ? false -, withPrimus ? false , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraProfile ? "" # string to append to profile , nativeOnly ? false , runtimeOnly ? false + +# DEPRECATED +, withJava ? config.steam.java or false +, withPrimus ? config.steam.primus or false }: let diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1c44ff28de..585a3f7e75e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21004,11 +21004,7 @@ in steamPackages = callPackage ../games/steam { }; - steam = steamPackages.steam-chrootenv.override { - # DEPRECATED - withJava = config.steam.java or false; - withPrimus = config.steam.primus or false; - }; + steam = steamPackages.steam-chrootenv; steam-run = steam.run; steam-run-native = (steam.override { |