From 74e7bbdf51924a08d827b6818d540287359936f6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 24 Apr 2025 10:05:06 +0800
Subject: [PATCH] gcompris: 4.3 -> 25.0

---
 pkgs/games/gcompris/default.nix | 22 +++++++---------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix
index bbb0e9de220f..3d533b702114 100644
--- a/pkgs/games/gcompris/default.nix
+++ b/pkgs/games/gcompris/default.nix
@@ -1,33 +1,29 @@
 {
+  lib,
   stdenv,
   cmake,
   fetchurl,
   gettext,
   gst_all_1,
-  lib,
   ninja,
   wrapQtAppsHook,
   qmlbox2d,
   qtbase,
   qtcharts,
   qtdeclarative,
-  qtgraphicaleffects,
   qtimageformats,
   qtmultimedia,
-  qtquickcontrols2,
   qtsensors,
   qttools,
-  qtxmlpatterns,
-  extra-cmake-modules,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gcompris";
-  version = "4.3";
+  version = "25.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${finalAttrs.version}.tar.xz";
-    hash = "sha256-x+oTh0Nu7MnCnKGR2vkALDclG59576u/+HPdftsDtcc=";
+    hash = "sha256-E3l+5l4rsauidl6Ik5gSWf+SGpVaAVi5X51etl1D05w=";
   };
 
   cmakeFlags = [
@@ -37,7 +33,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
     gettext
     ninja
     qttools
@@ -50,12 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
       qtbase
       qtcharts
       qtdeclarative
-      qtgraphicaleffects
       qtimageformats
       qtmultimedia
-      qtquickcontrols2
       qtsensors
-      qtxmlpatterns
     ]
     ++ (with gst_all_1; [
       gstreamer
@@ -73,12 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
   # we need a graphical environment for the tests
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "High quality educational software suite, including a large number of activities for children aged 2 to 10";
     homepage = "https://gcompris.net/";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "gcompris-qt";
-    maintainers = with maintainers; [ guibou ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ guibou ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 544f5f0355d2..fbb7d56c3315 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17141,7 +17141,7 @@ with pkgs;
 
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
 
-  gcompris = libsForQt5.callPackage ../games/gcompris { };
+  gcompris = kdePackages.callPackage ../games/gcompris { };
 
   gl-gsync-demo = callPackage ../games/gl-gsync-demo {
     libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;