public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #43556: ffmpeg: build fixes

This commit is contained in:
Vladimír Čunát 2018-07-15 11:17:18 +02:00
parent 03e13ab370 342f72e747
commit ba8cb47905
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
"--disable-stripping" "--disable-stripping"
# Disable mmx support for 0.6.90 # Disable mmx support for 0.6.90
(verFix null "0.6.90" "--disable-mmx") (verFix null "0.6.90" "--disable-mmx")
] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
"--cross-prefix=${stdenv.cc.targetPrefix}" "--cross-prefix=${stdenv.cc.targetPrefix}"
"--enable-cross-compile" "--enable-cross-compile"
] ++ optional stdenv.cc.isClang "--cc=clang"; ] ++ optional stdenv.cc.isClang "--cc=clang";
@ -170,9 +170,15 @@ stdenv.mkDerivation rec {
doCheck = false; # fails doCheck = false; # fails
# ffmpeg 3+ generates pkg-config (.pc) files that don't have the
# form automatically handled by the multiple-outputs hooks.
postFixup = '' postFixup = ''
moveToOutput bin "$bin" moveToOutput bin "$bin"
moveToOutput share/ffmpeg/examples "$doc" moveToOutput share/ffmpeg/examples "$doc"
for pc in ''${!outputDev}/lib/pkgconfig/*.pc; do
substituteInPlace $pc \
--replace "includedir=$out" "includedir=''${!outputInclude}"
done
''; '';
installFlags = [ "install-man" ]; installFlags = [ "install-man" ];