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

Merge pull request #12404 from abbradar/steam-newlibcpp

Browse Source 
Add options to use new libstdc++ on Steam
This commit is contained in:
Nikolay Amiantov 2016-01-15 15:13:00 +03:00
commit 26bd247921
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/games/steam/default.nix
View File

@ -1,11 +1,17 @@
{ pkgs, newScope }: { pkgs, newScope
, nativeOnly ? false
, runtimeOnly ? false
, newStdcpp ? false
}:
let let
callPackage = newScope self; callPackage = newScope self;
self = rec { self = rec {
steam-runtime = callPackage ./runtime.nix { }; steam-runtime = callPackage ./runtime.nix { };
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { }; steam-runtime-wrapped = callPackage ./runtime-wrapped.nix {
inherit nativeOnly runtimeOnly newStdcpp;
};
steam = callPackage ./steam.nix { }; steam = callPackage ./steam.nix { };
steam-chrootenv = callPackage ./chrootenv.nix { }; steam-chrootenv = callPackage ./chrootenv.nix { };
steam-fonts = callPackage ./fonts.nix { }; steam-fonts = callPackage ./fonts.nix { };

11
pkgs/games/steam/runtime-wrapped.nix
View File

@ -1,9 +1,11 @@
{ stdenv, 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; [
@ -77,19 +79,18 @@ let
SDL2_mixer SDL2_mixer
gstreamer gstreamer
gst_plugins_base gst_plugins_base
]; ] ++ lib.optional (!newStdcpp) gcc48.cc;
overridePkgs = with pkgs; [ overridePkgs = with pkgs; [
gcc48.cc # libstdc++
libpulseaudio libpulseaudio
alsaLib alsaLib
openalSoft openalSoft
]; ] ++ lib.optional newStdcpp gcc.cc;
ourRuntime = if runtimeOnly then [] ourRuntime = if runtimeOnly then []
else if nativeOnly then runtimePkgs ++ overridePkgs else if nativeOnly then runtimePkgs ++ overridePkgs
else overridePkgs; else overridePkgs;
steamRuntime = stdenv.lib.optional (!nativeOnly) steam-runtime; steamRuntime = lib.optional (!nativeOnly) steam-runtime;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "steam-runtime-wrapped"; name = "steam-runtime-wrapped";