From e2a40846186e906ceb5dd0021e12e8793566e43d Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Mon, 1 Jul 2024 17:30:16 +0200 Subject: [PATCH] kdenlive: add glaxnimate support for Qt6 --- pkgs/kde/gear/kdenlive/default.nix | 14 +++++++++++--- .../kdenlive/dependency-paths-glaxnimate.patch | 13 +++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 pkgs/kde/gear/kdenlive/dependency-paths-glaxnimate.patch diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index fe5f7e4c13b1..6c81e80cbf4f 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -1,4 +1,5 @@ { + lib, mkKdeDerivation, substituteAll, qtsvg, @@ -12,6 +13,8 @@ libv4l, frei0r, fetchpatch, + glaxnimate, + enableGlaxnimate ? true, }: mkKdeDerivation { pname = "kdenlive"; @@ -20,7 +23,7 @@ mkKdeDerivation { ( substituteAll { src = ./dependency-paths.patch; - inherit mediainfo mlt; + inherit mediainfo mlt glaxnimate; ffmpeg = ffmpeg-full; } ) @@ -31,7 +34,12 @@ mkKdeDerivation { url = "https://invent.kde.org/multimedia/kdenlive/-/commit/8be0e826471332bb739344ebe1859298c46e9e0f.patch"; hash = "sha256-5hLePH5NlO4Lx8lg9kjBPI4jTmP666RGplaVCmS/9TA="; }) - ]; + ] ++ lib.optional enableGlaxnimate ( + substituteAll { + src = ./dependency-paths-glaxnimate.patch; + inherit glaxnimate; + } + ); extraBuildInputs = [ qtsvg @@ -43,7 +51,7 @@ mkKdeDerivation { mlt shared-mime-info libv4l - ]; + ] ++ lib.optional enableGlaxnimate glaxnimate; qtWrapperArgs = [ "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" diff --git a/pkgs/kde/gear/kdenlive/dependency-paths-glaxnimate.patch b/pkgs/kde/gear/kdenlive/dependency-paths-glaxnimate.patch new file mode 100644 index 000000000000..17d7ddfcee96 --- /dev/null +++ b/pkgs/kde/gear/kdenlive/dependency-paths-glaxnimate.patch @@ -0,0 +1,13 @@ +diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +index 86fa5ef..6aeccbe 100644 +--- a/src/kdenlivesettings.kcfg ++++ b/src/kdenlivesettings.kcfg +@@ -657,7 +657,7 @@ + + + +- ++ @glaxnimate@/bin/glaxnimate + + + \ No newline at end of file