From 2c3fe2d0dff8b9096dee81fd0cb0d0ffce4d92c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 11 May 2019 11:08:31 +0200 Subject: [PATCH] ffmpeg-full: fix the build phase I was surprised the build is so slow, and I see it's single-threaded due to all work being done in install phase :-/ Please, do *not* rewrite phases unless you're really confident it's a good approach; typically postFoo and preFoo is much better. I considered filing this ffmpeg-related string of changes as a PR, but in the end it doesn't seem likely to need review and we have too many PRs as it is... (cherry picked from commit 5236232eea9a5cef21fe1f38c0ee22fd2a2bacfe) --- pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 2bb55102aa2f..05da125dd266 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -420,8 +420,8 @@ stdenv.mkDerivation rec { MediaToolbox VideoDecodeAcceleration libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ]; - # Build qt-faststart executable - buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; + buildFlags = [ "all" ] + ++ optional qtFaststartProgram "tools/qt-faststart"; # Build qt-faststart executable # Hacky framework patching technique borrowed from the phantomjs2 package postInstall = optionalString qtFaststartProgram ''