From d0f72e729ad5e6500d19c3d1dcfba05475885770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 11:29:37 +0200
Subject: [PATCH] libav: fix with multiple outputs and improve splitting

---
 pkgs/development/libraries/libav/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 8ca8695def8..5b1aa2f4284 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -77,13 +77,11 @@ let
 
     enableParallelBuilding = true;
 
-    outputs = [ "dev" "out" "bin" ]; #TODO: re-check
+    outputs = [ "dev" "out" "bin" ];
+    setOutputFlags = false;
 
-    # move avplay to get rid of the SDL dependency in the main output
-    postInstall = ''
-      mkdir -p "$bin/bin"
-      mv "$out/bin/avplay" "$bin/bin"
-    '';
+    # move tools away to lighten runtime deps and size
+    postInstall = ''_moveToOutput bin "$bin" '';
 
     doInstallCheck = false; # fails randomly
     installCheckTarget = "check"; # tests need to be run *after* installation