From 6145b7c77057794c8e8262c24ae2e0819009ca36 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sun, 16 Oct 2022 20:50:56 +1000 Subject: [PATCH 1/3] ffmpeg{,_{4,5}}-headless: init --- pkgs/top-level/all-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7063674249b9..8acd4a72e1c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18421,9 +18421,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; }; @@ -18435,6 +18454,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; rav1e = null; # We already have SVT-AV1 for faster encoding From 501c5af829108d0676c1f4152f4c79fdf71dfc95 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sun, 16 Oct 2022 20:52:38 +1000 Subject: [PATCH 2/3] unpaper: use ffmpeg_5-headless --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8acd4a72e1c6..b73de2b57606 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32190,7 +32190,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 { }; From d1f673e3b62964da0f2d88cbd711178e59f51066 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Sun, 16 Oct 2022 23:34:52 +1000 Subject: [PATCH 3/3] navidrome: use ffmpeg-headless --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b73de2b57606..d1f8b6bf315d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37612,7 +37612,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 { };