diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-05-15 02:35:08 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-05-15 02:35:17 +0300 |
| commit | 229e544148551d4ef7a98506e86f25dd673bb479 (patch) | |
| tree | 415fb205b165ae6441ece489798ed6502aaf02ed /pkgs | |
| parent | db7bf64e31933a4c07e3e34fd8d94259a54d7160 (diff) | |
| download | nixlib-229e544148551d4ef7a98506e86f25dd673bb479.tar nixlib-229e544148551d4ef7a98506e86f25dd673bb479.tar.gz nixlib-229e544148551d4ef7a98506e86f25dd673bb479.tar.bz2 nixlib-229e544148551d4ef7a98506e86f25dd673bb479.tar.lz nixlib-229e544148551d4ef7a98506e86f25dd673bb479.tar.xz nixlib-229e544148551d4ef7a98506e86f25dd673bb479.tar.zst nixlib-229e544148551d4ef7a98506e86f25dd673bb479.zip | |
steamPackages.steam-runtime-wrapped: fix w. multiple outputs
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/games/steam/runtime-wrapped.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index a8037be8f830..1f643c5194af 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -82,6 +82,7 @@ let ] ++ lib.optional (!newStdcpp) gcc48.cc; overridePkgs = with pkgs; [ + libgpgerror libpulseaudio alsaLib openalSoft @@ -93,18 +94,18 @@ let else overridePkgs; steamRuntime = lib.optional (!nativeOnly) steam-runtime; + allPkgs = ourRuntime ++ steamRuntime; + in stdenv.mkDerivation rec { name = "steam-runtime-wrapped"; - allPkgs = ourRuntime ++ steamRuntime; - nativeBuildInputs = [ perl ]; builder = ./build-wrapped.sh; installPhase = '' - buildDir "${toString steam-runtime.libs}" "$allPkgs" - buildDir "${toString steam-runtime.bins}" "$allPkgs" + buildDir "${toString steam-runtime.libs}" "${toString (map lib.getLib allPkgs)}" + buildDir "${toString steam-runtime.bins}" "${toString (map lib.getBin allPkgs)}" ''; meta.hydraPlatforms = []; |