From 6e5b099e16bad9cd836392c1ee6dedaea851187d Mon Sep 17 00:00:00 2001
From: Tobias Bora <tobias.bora@gmail.com>
Date: Thu, 4 Jul 2024 14:43:36 +0200
Subject: [PATCH] kdenlive: minor refactoring

---
 pkgs/applications/kde/kdenlive/default.nix    | 21 +++++++++++--------
 .../dependency-paths-glaxnimate.patch         | 13 ------------
 .../kde/kdenlive/dependency-paths.patch       | 12 ++++++++---
 pkgs/kde/gear/kdenlive/default.nix            | 11 +++-------
 .../dependency-paths-glaxnimate.patch         | 13 ------------
 pkgs/kde/gear/kdenlive/dependency-paths.patch | 12 ++++++++---
 6 files changed, 33 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/kde/kdenlive/dependency-paths-glaxnimate.patch
 delete mode 100644 pkgs/kde/gear/kdenlive/dependency-paths-glaxnimate.patch

diff --git a/pkgs/applications/kde/kdenlive/default.nix b/pkgs/applications/kde/kdenlive/default.nix
index b6dbe3d99d8d..d5d465b8c4fe 100644
--- a/pkgs/applications/kde/kdenlive/default.nix
+++ b/pkgs/applications/kde/kdenlive/default.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, substituteAll
 , lib
 , extra-cmake-modules
 , breeze-icons
@@ -83,23 +84,25 @@ mkDerivation {
     wrapGAppsHook3
     glaxnimate
   ];
+
   # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
   # doesn't find them. See:
   # https://github.com/NixOS/nixpkgs/issues/83885
-  patches = [ ./dependency-paths.patch ./dependency-paths-glaxnimate.patch ];
-
-  # Needed to replace @glaxnimate@ by its path
-  env = {
-    inherit mediainfo glaxnimate;
-    ffmpeg = ffmpeg-full;
-    mlt = mlt-full;
-  };
+  patches = [
+    (
+      substituteAll {
+        src = ./dependency-paths.patch;
+        inherit mediainfo glaxnimate;
+        ffmpeg = ffmpeg-full;
+        mlt = mlt-full;
+      }
+    )
+  ];
 
   postPatch =
     # Module Qt5::Concurrent must be included in `find_package` before it is used.
     ''
       sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
-      substituteAllInPlace src/kdenlivesettings.kcfg
     '';
 
   dontWrapGApps = true;
diff --git a/pkgs/applications/kde/kdenlive/dependency-paths-glaxnimate.patch b/pkgs/applications/kde/kdenlive/dependency-paths-glaxnimate.patch
deleted file mode 100644
index 17d7ddfcee96..000000000000
--- a/pkgs/applications/kde/kdenlive/dependency-paths-glaxnimate.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 @@
-
-     <entry name="glaxnimatePath" type="String">
-       <label>Path to the Glaxnimate application.</label>
--      <default></default>
-+      <default>@glaxnimate@/bin/glaxnimate</default>
-     </entry>
-
-     <entry name="nice_tasks" type="Bool">
\ No newline at end of file
diff --git a/pkgs/applications/kde/kdenlive/dependency-paths.patch b/pkgs/applications/kde/kdenlive/dependency-paths.patch
index ba3f7e6c8de9..013960377268 100644
--- a/pkgs/applications/kde/kdenlive/dependency-paths.patch
+++ b/pkgs/applications/kde/kdenlive/dependency-paths.patch
@@ -1,6 +1,5 @@
-diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
-index 029849e5f..8befe4888 100644
---- a/src/kdenlivesettings.kcfg
+diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
+--- b/src/kdenlivesettings.kcfg
 +++ b/src/kdenlivesettings.kcfg
 @@ -517,7 +517,7 @@
    <group name="env">
@@ -44,3 +43,10 @@ index 029849e5f..8befe4888 100644
      </entry>
  
      <entry name="processingthreads" type="Int">
+@@ -657,5 +657,5 @@
+     <entry name="glaxnimatePath" type="String">
+       <label>Path to the Glaxnimate application.</label>
+-      <default></default>
++      <default>@glaxnimate@/bin/glaxnimate</default>
+     </entry>
+     <entry name="nice_tasks" type="Bool">
diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix
index 6c81e80cbf4f..a4d5258e5cde 100644
--- a/pkgs/kde/gear/kdenlive/default.nix
+++ b/pkgs/kde/gear/kdenlive/default.nix
@@ -14,7 +14,6 @@
   frei0r,
   fetchpatch,
   glaxnimate,
-  enableGlaxnimate ? true,
 }:
 mkKdeDerivation {
   pname = "kdenlive";
@@ -34,12 +33,7 @@ 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
@@ -51,7 +45,8 @@ mkKdeDerivation {
     mlt
     shared-mime-info
     libv4l
-  ] ++ lib.optional enableGlaxnimate glaxnimate;
+    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
deleted file mode 100644
index 17d7ddfcee96..000000000000
--- a/pkgs/kde/gear/kdenlive/dependency-paths-glaxnimate.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 @@
-
-     <entry name="glaxnimatePath" type="String">
-       <label>Path to the Glaxnimate application.</label>
--      <default></default>
-+      <default>@glaxnimate@/bin/glaxnimate</default>
-     </entry>
-
-     <entry name="nice_tasks" type="Bool">
\ No newline at end of file
diff --git a/pkgs/kde/gear/kdenlive/dependency-paths.patch b/pkgs/kde/gear/kdenlive/dependency-paths.patch
index 7fd04bd5114d..4faaf6135617 100644
--- a/pkgs/kde/gear/kdenlive/dependency-paths.patch
+++ b/pkgs/kde/gear/kdenlive/dependency-paths.patch
@@ -1,6 +1,5 @@
-diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
-index 029849e5f..8befe4888 100644
---- a/src/kdenlivesettings.kcfg
+diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
+--- b/src/kdenlivesettings.kcfg
 +++ b/src/kdenlivesettings.kcfg
 @@ -517,7 +517,7 @@
    <group name="env">
@@ -44,3 +43,10 @@ index 029849e5f..8befe4888 100644
      </entry>
  
      <entry name="processingthreads" type="Int">
+@@ -657,5 +657,5 @@
+     <entry name="glaxnimatePath" type="String">
+       <label>Path to the Glaxnimate application.</label>
+-      <default></default>
++      <default>@glaxnimate@/bin/glaxnimate</default>
+     </entry>
+     <entry name="nice_tasks" type="Bool">