diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-01-15 14:54:01 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-01-15 15:01:55 +0300 |
| commit | 9a07a8505ea666742b0f3161bcf80846fbf22e13 (patch) | |
| tree | 515d2e6a24033ac02d85b4cc692282dd0ffc9d3c /pkgs/games/steam | |
| parent | 31b5070cce8be311c705a5d049aee9d21be7548e (diff) | |
| download | nixpkgs-9a07a8505ea666742b0f3161bcf80846fbf22e13.tar nixpkgs-9a07a8505ea666742b0f3161bcf80846fbf22e13.tar.gz nixpkgs-9a07a8505ea666742b0f3161bcf80846fbf22e13.tar.bz2 nixpkgs-9a07a8505ea666742b0f3161bcf80846fbf22e13.tar.lz nixpkgs-9a07a8505ea666742b0f3161bcf80846fbf22e13.tar.xz nixpkgs-9a07a8505ea666742b0f3161bcf80846fbf22e13.tar.zst nixpkgs-9a07a8505ea666742b0f3161bcf80846fbf22e13.zip | |
steam-runtime-wrapped: add optional override of libstdc++
Diffstat (limited to 'pkgs/games/steam')
| -rw-r--r-- | pkgs/games/steam/runtime-wrapped.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 56422deb1db..c1c79f8ac43 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -1,9 +1,11 @@ -{ stdenv, perl, pkgs, steam-runtime +{ stdenv, lib, perl, pkgs, steam-runtime , nativeOnly ? false , runtimeOnly ? false +, newStdcpp ? false }: assert !(nativeOnly && runtimeOnly); +assert newStdcpp -> !runtimeOnly; let runtimePkgs = with pkgs; [ @@ -77,19 +79,18 @@ let SDL2_mixer gstreamer gst_plugins_base - ]; + ] ++ lib.optional (!newStdcpp) gcc48.cc; overridePkgs = with pkgs; [ - gcc48.cc # libstdc++ libpulseaudio alsaLib openalSoft - ]; + ] ++ lib.optional newStdcpp gcc.cc; ourRuntime = if runtimeOnly then [] else if nativeOnly then runtimePkgs ++ overridePkgs else overridePkgs; - steamRuntime = stdenv.lib.optional (!nativeOnly) steam-runtime; + steamRuntime = lib.optional (!nativeOnly) steam-runtime; in stdenv.mkDerivation rec { name = "steam-runtime-wrapped"; |