Merge pull request #196263 from vs49688/miniffmpeg

ffmpeg{,_{4,5}}-headless: init
This commit is contained in:
Robert Scott
2022-10-20 20:33:02 +01:00
committed by GitHub
+27 -2
View File
@@ -18488,9 +18488,28 @@ with pkgs;
linbox = callPackage ../development/libraries/linbox { };
ffmpeg_4-headless = callPackage ../development/libraries/ffmpeg/4.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
sdlSupport = false;
vdpauSupport = false;
pulseaudioSupport = false;
libva = libva-minimal;
};
ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
};
ffmpeg_5-headless = callPackage ../development/libraries/ffmpeg/5.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
sdlSupport = false;
vdpauSupport = false;
pulseaudioSupport = false;
libva = libva-minimal;
};
ffmpeg_5 = callPackage ../development/libraries/ffmpeg/5.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia VideoToolbox;
};
@@ -18502,6 +18521,8 @@ with pkgs;
# version number which the upstream support.
ffmpeg = ffmpeg_4;
ffmpeg-headless = ffmpeg_4-headless;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
svt-av1 = if stdenv.isAarch64 then null else svt-av1;
rtmpdump = null; # Prefer the built-in RTMP implementation
@@ -32255,7 +32276,9 @@ with pkgs;
enableX11 = config.unison.enableX11 or true;
};
unpaper = callPackage ../tools/graphics/unpaper { };
unpaper = callPackage ../tools/graphics/unpaper {
ffmpeg_5 = ffmpeg_5-headless;
};
unison-ucm = callPackage ../development/compilers/unison { };
@@ -37678,7 +37701,9 @@ with pkgs;
gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
navidrome = callPackage ../servers/misc/navidrome {};
navidrome = callPackage ../servers/misc/navidrome {
ffmpeg = ffmpeg-headless;
};
zalgo = callPackage ../tools/misc/zalgo { };