mpv/ffmpeg: consolidate the different ffmpeg configs into overlays/preferences

This commit is contained in:
2024-07-20 19:13:32 +00:00
parent 99c19ceac0
commit 68ef56b572
3 changed files with 13 additions and 8 deletions

View File

@@ -1,13 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
sane.programs.kdenlive = { sane.programs.kdenlive = {
packageUnwrapped = pkgs.kdenlive.override {
ffmpeg-full = pkgs.ffmpeg-full.override {
# avoid expensive samba build for a feature i don't use
withSamba = false;
};
};
buildCost = 1; buildCost = 1;
sandbox.method = "bwrap"; sandbox.method = "bwrap";

View File

@@ -146,7 +146,10 @@ in
# i think using `luajit` here instead of `lua` is optional, just i get better perf with it :) # i think using `luajit` here instead of `lua` is optional, just i get better perf with it :)
lua = pkgs.luajit.override { enable52Compat = true; self = lua; }; lua = pkgs.luajit.override { enable52Compat = true; self = lua; };
# ship a ffmpeg with sofa enabled, for surround-sound downmixing # ship a ffmpeg with sofa enabled, for surround-sound downmixing
ffmpeg = pkgs.ffmpeg-full; # ffmpeg = pkgs.ffmpeg-full;
ffmpeg = pkgs.ffmpeg.override {
withMysofa = true;
};
}; };
scripts = [ scripts = [
pkgs.mpvScripts.mpris pkgs.mpvScripts.mpris

View File

@@ -13,6 +13,15 @@
enableOAuth2 = false; enableOAuth2 = false;
}; };
ffmpeg = super.ffmpeg.override {
# required by mpv for spatial audio; enable it globally to avoid shipping many ffmpegs
withMysofa = true;
};
ffmpeg-full = super.ffmpeg-full.override {
# saves 20 minutes of build time and cross issues, for unused feature
withSamba = false;
};
gnome = super.gnome.overrideScope (gself: gsuper: with gself; { gnome = super.gnome.overrideScope (gself: gsuper: with gself; {
gnome-control-center = gsuper.gnome-control-center.override { gnome-control-center = gsuper.gnome-control-center.override {
# i build goa without the "backend", to avoid webkit_4_1. # i build goa without the "backend", to avoid webkit_4_1.