kdePackages: Gear 25.04.3 -> 25.08.0

pkgs/kde/gear/angelfish/default.nix

@@ -16,7 +16,7 @@ mkKdeDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version;
     src = sources.${pname};
-    hash = "sha256-FgzmWw8FZb+DNSf2n6H14Rq07+x1LzG9hX4hFetuqDw=";
+    hash = "sha256-aGpmkuw7Y0PRFp0+0ozv5/A80O2T9lMN9SJfKfExx/o=";
   };
 
   extraNativeBuildInputs = [

pkgs/kde/gear/artikulate/default.nix

@@ -6,6 +6,4 @@ mkKdeDerivation {
   pname = "artikulate";
 
   extraBuildInputs = [ qtmultimedia ];
-  # FIXME(qt5)
-  meta.broken = true;
 }

pkgs/kde/gear/cervisia/default.nix

@@ -1,6 +0,0 @@
-{ mkKdeDerivation }:
-mkKdeDerivation {
-  pname = "cervisia";
-  # FIXME(qt5)
-  meta.broken = true;
-}

pkgs/kde/gear/default.nix

@@ -27,7 +27,6 @@
   calindori = callPackage ./calindori { };
   calligra = callPackage ./calligra { };
   cantor = callPackage ./cantor { };
-  cervisia = callPackage ./cervisia { };
   colord-kde = callPackage ./colord-kde { };
   dolphin = callPackage ./dolphin { };
   dolphin-plugins = callPackage ./dolphin-plugins { };

pkgs/kde/gear/dolphin/default.nix

@@ -1,4 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qtmultimedia,
+}:
 mkKdeDerivation {
   pname = "dolphin";
+
+  extraBuildInputs = [ qtmultimedia ];
 }

pkgs/kde/gear/dragon/default.nix

@@ -1,18 +1,23 @@
 {
   mkKdeDerivation,
+  pkg-config,
+  qtmultimedia,
   kconfigwidgets,
   kparts,
   kxmlgui,
-  phonon,
+  ffmpeg,
 }:
 mkKdeDerivation {
   pname = "dragon";
 
+  extraNativeBuildInputs = [ pkg-config ];
+
   extraBuildInputs = [
+    qtmultimedia
     kconfigwidgets
     kparts
     kxmlgui
-    phonon
+    ffmpeg
   ];
 
   meta.mainProgram = "dragon";

pkgs/kde/gear/gwenview/default.nix

@@ -1,10 +1,9 @@
 {
   mkKdeDerivation,
+  qtmultimedia,
   qtsvg,
   qtwayland,
   qtimageformats,
-  phonon,
-  phonon-vlc,
   pkg-config,
   cfitsio,
   exiv2,
@@ -18,14 +17,13 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
+    qtmultimedia
     qtsvg
     qtwayland
+
     # adds support for webp and other image formats
     qtimageformats
 
-    phonon
-    phonon-vlc
-
     cfitsio
     exiv2
     baloo

pkgs/kde/gear/juk/default.nix

@@ -1,15 +1,15 @@
 {
   mkKdeDerivation,
+  qtmultimedia,
   qtsvg,
-  phonon,
   taglib,
 }:
 mkKdeDerivation {
   pname = "juk";
 
   extraBuildInputs = [
+    qtmultimedia
     qtsvg
-    phonon
     taglib
   ];
 

pkgs/kde/gear/kamoso/default.nix

@@ -1,6 +1,18 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  pkg-config,
+  gst_all_1,
+}:
 mkKdeDerivation {
   pname = "kamoso";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraNativeBuildInputs = [ pkg-config ];
+  extraBuildInputs = [
+    gst_all_1.gst-plugins-base
+    (gst_all_1.gst-plugins-good.override { qt6Support = true; })
+  ];
+
+  preFixup = ''
+    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+  '';
 }

pkgs/kde/gear/kdenlive/default.nix

@@ -1,7 +1,6 @@
 {
   mkKdeDerivation,
   replaceVars,
-  mediainfo,
   mlt,
   glaxnimate,
   ffmpeg-full,
@@ -20,7 +19,7 @@ mkKdeDerivation {
 
   patches = [
     (replaceVars ./dependency-paths.patch {
-      inherit mediainfo mlt glaxnimate;
+      inherit mlt glaxnimate;
       ffmpeg = ffmpeg-full;
     })
   ];

pkgs/kde/gear/kdenlive/dependency-paths.patch

@@ -1,7 +1,8 @@
-diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
---- b/src/kdenlivesettings.kcfg
+diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
+index d92555f0b5..a7b32b5183 100644
+--- a/src/kdenlivesettings.kcfg
 +++ b/src/kdenlivesettings.kcfg
-@@ -517,7 +517,7 @@
+@@ -628,7 +628,7 @@
    <group name="env">
      <entry name="mltpath" type="Path">
        <label>Mlt framework install path.</label>
@@ -10,7 +11,7 @@ diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
      </entry>
  
      <entry name="kdenliverendererpath" type="Path">
-@@ -527,27 +527,27 @@
+@@ -638,22 +638,22 @@
  
      <entry name="meltpath" type="Path">
        <label>Mlt melt renderer install path.</label>
@@ -36,17 +37,13 @@ diff -u b/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
 +      <default>@ffmpeg@/bin/ffprobe</default>
      </entry>
  
-     <entry name="mediainfopath" type="Path">
-       <label>mediaInfo binary path.</label>
--      <default></default>
-+      <default>@mediainfo@/bin/mediainfo</default>
-     </entry>
- 
      <entry name="processingthreads" type="Int">
-@@ -657,5 +657,5 @@
+@@ -758,7 +758,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">

pkgs/kde/gear/kig/default.nix

@@ -1,6 +1,4 @@
 { mkKdeDerivation }:
 mkKdeDerivation {
   pname = "kig";
-  # FIXME(qt5)
-  meta.broken = true;
 }

pkgs/kde/gear/kio-extras/add-nixos-man-db-config-path.patch

@@ -1,13 +0,0 @@
-diff --git a/man/kio_man.cpp b/man/kio_man.cpp
-index a2fb6dbf5..cb6f373bc 100644
---- a/man/kio_man.cpp
-+++ b/man/kio_man.cpp
-@@ -868,6 +868,8 @@ void MANProtocol::constructPath(QStringList &constr_path, QStringList constr_cat
-         mc.setFileName("/etc/manpath.config"); // SuSE, Debian
-     if (!mc.exists())
-         mc.setFileName("/etc/man.config"); // Mandrake
-+    if (!mc.exists())
-+        mc.setFileName("/run/current-system/etc/man_db.conf"); // NixOS
- 
-     if (mc.open(QIODevice::ReadOnly)) {
-         QTextStream is(&mc);

pkgs/kde/gear/kio-extras/default.nix

@@ -19,10 +19,6 @@
 mkKdeDerivation {
   pname = "kio-extras";
 
-  patches = [
-    # An upstream merge request is pending for this https://invent.kde.org/network/kio-extras/-/merge_requests/422
-    ./add-nixos-man-db-config-path.patch
-  ];
   extraNativeBuildInputs = [
     pkg-config
     gperf

pkgs/kde/gear/kqtquickcharts/default.nix

@@ -1,6 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  qtdeclarative,
+}:
 mkKdeDerivation {
   pname = "kqtquickcharts";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraBuildInputs = [ qtdeclarative ];
 }

pkgs/kde/gear/ktouch/default.nix

@@ -1,6 +1,9 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kqtquickcharts,
+}:
 mkKdeDerivation {
   pname = "ktouch";
-  # FIXME(qt5)
-  meta.broken = true;
+
+  extraBuildInputs = [ kqtquickcharts ];
 }

pkgs/kde/gear/neochat/default.nix

@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   qtlocation,
+  qtspeech,
   qtwebview,
 }:
 mkKdeDerivation {
@@ -8,6 +9,7 @@ mkKdeDerivation {
 
   extraBuildInputs = [
     qtlocation
+    qtspeech
     qtwebview
   ];
   meta.mainProgram = "neochat";