ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 12:53:59 +03:00
Code Issues Projects Releases Wiki Activity

steam-run: refactor, remove unneeded files and dependencies

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-05-26 14:33:18 +03:00
parent 1ab408e1da
commit ff0995707d
1 changed files with 78 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/games/steam/chrootenv.nix
View File

@ -8,14 +8,8 @@
}: }:
let let
self = { commonTargetPkgs = pkgs: with pkgs; [
name = "steam";
targetPkgs = pkgs: with pkgs; [
steamPackages.steam
steamPackages.steam-fonts steamPackages.steam-fonts
# License agreement
gnome3.zenity
# Errors in output without those # Errors in output without those
pciutils pciutils
python2 python2
@ -26,7 +20,17 @@ let
perl perl
# Open URLs # Open URLs
xdg_utils xdg_utils
] ++ lib.optional withJava jdk ];
in buildFHSUserEnv rec {
name = "steam";
targetPkgs = pkgs: with pkgs; [
steamPackages.steam
# License agreement
gnome3.zenity
] ++ commonTargetPkgs pkgs
++ lib.optional withJava jdk
++ lib.optional withPrimus (primus.override { ++ lib.optional withPrimus (primus.override {
stdenv = overrideInStdenv stdenv [ useOldCXXAbi ]; stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ]; stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
@ -72,9 +76,12 @@ let
runScript = "steam"; runScript = "steam";
passthru.run = buildFHSUserEnv (self // { passthru.run = buildFHSUserEnv {
name = "steam-run"; name = "steam-run";
targetPkgs = commonTargetPkgs;
inherit multiPkgs extraBuildCommands;
runScript = runScript =
let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs
++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs); ++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs);
@ -89,9 +96,5 @@ let
export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
exec "$run" "$@" exec "$run" "$@"
''; '';
passthru = {};
});
}; };
}
in buildFHSUserEnv self