swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

steam: Get rid of newStdcpp option, always on

Browse source
This commit is contained in:
Sarah Brofeldt 2017-09-10 10:54:06 +02:00
parent 799435b7ca
commit 734a04800a
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/games/steam/chrootenv.nix
View file

@ -5,16 +5,11 @@
, extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
, nativeOnly ? false , nativeOnly ? false
, runtimeOnly ? false , runtimeOnly ? false
, newStdcpp ? false
}: }:
let let
commonTargetPkgs = pkgs: with pkgs; commonTargetPkgs = pkgs: with pkgs;
let let
primus2 = if newStdcpp then primus else primus.override {
stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
};
tzdir = "${pkgs.tzdata}/share/zoneinfo"; tzdir = "${pkgs.tzdata}/share/zoneinfo";
# I'm not sure if this is the best way to add things like this # I'm not sure if this is the best way to add things like this
# to an FHSUserEnv # to an FHSUserEnv
@ -38,7 +33,7 @@ let
# Zoneinfo # Zoneinfo
etc-zoneinfo etc-zoneinfo
] ++ lib.optional withJava jdk ] ++ lib.optional withJava jdk
++ lib.optional withPrimus primus2 ++ lib.optional withPrimus primus
++ extraPkgs pkgs; ++ extraPkgs pkgs;
in buildFHSUserEnv rec { in buildFHSUserEnv rec {
@ -68,7 +63,7 @@ in buildFHSUserEnv rec {
xlibs.libpciaccess xlibs.libpciaccess
(steamPackages.steam-runtime-wrapped.override { (steamPackages.steam-runtime-wrapped.override {
inherit nativeOnly runtimeOnly newStdcpp; inherit nativeOnly runtimeOnly;
}) })
]; ];

7
pkgs/games/steam/runtime-wrapped.nix
View file

@ -1,11 +1,9 @@
{ stdenv, lib, perl, pkgs, steam-runtime { stdenv, lib, perl, pkgs, steam-runtime
, nativeOnly ? false , nativeOnly ? false
, runtimeOnly ? false , runtimeOnly ? false
, newStdcpp ? false
}: }:
assert !(nativeOnly && runtimeOnly); assert !(nativeOnly && runtimeOnly);
assert newStdcpp -> !runtimeOnly;
let let
runtimePkgs = with pkgs; [ runtimePkgs = with pkgs; [
@ -79,7 +77,7 @@ let
SDL2_mixer SDL2_mixer
gstreamer gstreamer
gst-plugins-base gst-plugins-base
] ++ lib.optional (!newStdcpp) gcc48.cc; ];
overridePkgs = with pkgs; [ overridePkgs = with pkgs; [
libgpgerror libgpgerror
@ -88,7 +86,8 @@ let
openalSoft openalSoft
libva libva
vulkan-loader vulkan-loader
] ++ lib.optional newStdcpp gcc.cc; gcc.cc
];
ourRuntime = if runtimeOnly then [] ourRuntime = if runtimeOnly then []
else if nativeOnly then runtimePkgs ++ overridePkgs else if nativeOnly then runtimePkgs ++ overridePkgs