From 229e544148551d4ef7a98506e86f25dd673bb479 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 15 May 2016 02:35:08 +0300 Subject: steamPackages.steam-runtime-wrapped: fix w. multiple outputs --- pkgs/games/steam/runtime-wrapped.nix | 9 +++++---- 1 file 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 = []; -- cgit 1.4.1