aboutsummaryrefslogtreecommitdiff
path: root/pkgs/development/libraries/libav
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-04 11:29:37 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-10-04 11:29:37 +0200
commitd0f72e729ad5e6500d19c3d1dcfba05475885770 (patch)
tree5d8c1ac940e7e31de4f73d2ea7881a827c892a83 /pkgs/development/libraries/libav
parent0cf11036b467068875d2dce9fe10b38b006f4528 (diff)
libav: fix with multiple outputs and improve splitting
Diffstat (limited to 'pkgs/development/libraries/libav')
-rw-r--r--pkgs/development/libraries/libav/default.nix10
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 8ca8695def8f..5b1aa2f42846 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