diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-07-15 11:17:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-07-15 11:17:18 +0200 |
| commit | ba8cb47905ab85a71443bb2a0570366ce938f61c (patch) | |
| tree | 9e2cc22f93fca56c7d3758334b76a10853534c32 /pkgs/development | |
| parent | 03e13ab3706d49f2f94d826abee9c5badc66a68e (diff) | |
| parent | 342f72e747369c19f041e4169d93b3283dbe15a9 (diff) | |
| download | nixlib-ba8cb47905ab85a71443bb2a0570366ce938f61c.tar nixlib-ba8cb47905ab85a71443bb2a0570366ce938f61c.tar.gz nixlib-ba8cb47905ab85a71443bb2a0570366ce938f61c.tar.bz2 nixlib-ba8cb47905ab85a71443bb2a0570366ce938f61c.tar.lz nixlib-ba8cb47905ab85a71443bb2a0570366ce938f61c.tar.xz nixlib-ba8cb47905ab85a71443bb2a0570366ce938f61c.tar.zst nixlib-ba8cb47905ab85a71443bb2a0570366ce938f61c.zip | |
Merge #43556: ffmpeg: build fixes
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 270e96055822..bc70c5ab2371 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") - ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" ] ++ optional stdenv.cc.isClang "--cc=clang"; @@ -170,9 +170,15 @@ stdenv.mkDerivation rec { doCheck = false; # fails + # ffmpeg 3+ generates pkg-config (.pc) files that don't have the + # form automatically handled by the multiple-outputs hooks. postFixup = '' moveToOutput bin "$bin" moveToOutput share/ffmpeg/examples "$doc" + for pc in ''${!outputDev}/lib/pkgconfig/*.pc; do + substituteInPlace $pc \ + --replace "includedir=$out" "includedir=''${!outputInclude}" + done ''; installFlags = [ "install-man" ]; |