public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

steam: fix primus with new libstdc++ and add to steam-run

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-07-11 18:07:55 +03:00
parent 532211c68d
commit 6a3e2f89fb
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,13 @@
}: }:
let let
commonTargetPkgs = pkgs: with pkgs; [ commonTargetPkgs = pkgs: with pkgs;
let primus2 =
if newStdcpp then primus else primus.override {
stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
};
in [
steamPackages.steam-fonts steamPackages.steam-fonts
# Errors in output without those # Errors in output without those
pciutils pciutils
@ -20,7 +26,8 @@ let
perl perl
# Open URLs # Open URLs
xdg_utils xdg_utils
]; ] ++ lib.optional withJava jdk
++ lib.optional withPrimus primus2;
in buildFHSUserEnv rec { in buildFHSUserEnv rec {
name = "steam"; name = "steam";
@ -29,12 +36,7 @@ in buildFHSUserEnv rec {
steamPackages.steam steamPackages.steam
# License agreement # License agreement
gnome3.zenity gnome3.zenity
] ++ commonTargetPkgs pkgs ] ++ commonTargetPkgs pkgs;
++ lib.optional withJava jdk
++ lib.optional withPrimus (primus.override {
stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
});
multiPkgs = pkgs: with pkgs; [ multiPkgs = pkgs: with pkgs; [
# These are required by steam with proper errors # These are required by steam with proper errors