mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
ffmpeg: fix arm build
This commit is contained in:
parent
c5a9ad1880
commit
6679dbbd60
|
@ -55,6 +55,8 @@ let
|
|||
|
||||
# Disable dependency that needs fixes before it will work on Darwin or Arm
|
||||
disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg;
|
||||
|
||||
vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm);
|
||||
in
|
||||
|
||||
assert openglSupport -> mesa != null;
|
||||
|
@ -121,7 +123,7 @@ stdenv.mkDerivation rec {
|
|||
"--enable-libmp3lame"
|
||||
(ifMinVer "1.2" "--enable-iconv")
|
||||
"--enable-libtheora"
|
||||
(ifMinVer "0.6" (enableFeature (isLinux || isFreeBSD) "vaapi"))
|
||||
(ifMinVer "0.6" (enableFeature vaapiSupport "vaapi"))
|
||||
"--enable-vdpau"
|
||||
"--enable-libvorbis"
|
||||
(disDarwinOrArmFix (ifMinVer "0.6" "--enable-libvpx") "0.6" "--disable-libvpx")
|
||||
|
@ -197,8 +199,7 @@ stdenv.mkDerivation rec {
|
|||
installFlags = [ "install-man" ];
|
||||
|
||||
passthru = {
|
||||
vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false;
|
||||
inherit vdpauSupport;
|
||||
inherit vaapiSupport vdpauSupport;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
Loading…
Reference in a new issue