From 6fadeb200b13c57532a3215c5ad039e098b4296d Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 21 Feb 2025 22:51:35 +0800
Subject: [PATCH 1/2] krusader: remove with lib

---
 pkgs/applications/file-managers/krusader/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix
index e11d3f71af89..6e2f8f125c2f 100644
--- a/pkgs/applications/file-managers/krusader/default.nix
+++ b/pkgs/applications/file-managers/krusader/default.nix
@@ -1,6 +1,6 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   extra-cmake-modules,
   kdoctools,
@@ -14,7 +14,7 @@
   kwindowsystem,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "krusader";
   version = "2.8.1";
 
@@ -44,11 +44,11 @@ mkDerivation rec {
     kwindowsystem
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.krusader.org";
     description = "Norton/Total Commander clone for KDE";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ sander ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ sander ];
     mainProgram = "krusader";
   };
 }

From feb585fbd769d96df8bb0a4a9bb63eb04fce0570 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Fri, 21 Feb 2025 23:22:54 +0800
Subject: [PATCH 2/2] krusader: 2.8.1 -> 2.9.0

---
 .../file-managers/krusader/compat-fix.patch   | 20 ----------------
 .../file-managers/krusader/default.nix        | 23 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 12 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/file-managers/krusader/compat-fix.patch

diff --git a/pkgs/applications/file-managers/krusader/compat-fix.patch b/pkgs/applications/file-managers/krusader/compat-fix.patch
deleted file mode 100644
index 5411982b97ba..000000000000
--- a/pkgs/applications/file-managers/krusader/compat-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/app/compat.h b/app/compat.h
-index b63d561..c051f35 100644
---- a/app/compat.h
-+++ b/app/compat.h
-@@ -11,13 +11,13 @@
- 
- #if __has_include(<KCompletion/kcompletion_version.h>)
- #  include <KCompletion/kcompletion_version.h>
--#else // Pre KF-5.91 header layout
-+#elif __has_include(<kcompletion_version.h>) // Pre KF-5.91 header layout
- #  include <kcompletion_version.h>
- #endif
- 
- #if __has_include(<KArchive/karchive_version.h>)
- #  include <KArchive/karchive_version.h>
--#else // Pre KF-5.91 header layout
-+#elif __has_include(<karchive_version.h>) // Pre KF-5.91 header layout
- #  include <karchive_version.h>
- #endif
- 
diff --git a/pkgs/applications/file-managers/krusader/default.nix b/pkgs/applications/file-managers/krusader/default.nix
index 6e2f8f125c2f..cd3dc3be2b47 100644
--- a/pkgs/applications/file-managers/krusader/default.nix
+++ b/pkgs/applications/file-managers/krusader/default.nix
@@ -4,34 +4,32 @@
   fetchurl,
   extra-cmake-modules,
   kdoctools,
-  wrapGAppsHook3,
   karchive,
   kconfig,
   kcrash,
   kguiaddons,
-  kinit,
   kparts,
   kwindowsystem,
+  cmake,
+  wrapQtAppsHook,
+  qt5compat,
+  kstatusnotifieritem,
 }:
 
 stdenv.mkDerivation rec {
   pname = "krusader";
-  version = "2.8.1";
+  version = "2.9.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-N78gRRnQqxukCWSvAnQbwijxHpfyjExRjKBdNY3xgoM=";
+    url = "mirror://kde/stable/krusader/${version}/krusader-${version}.tar.xz";
+    hash = "sha256-ybeb+t5sxp/g40Hs75Mvysiv2f6U6MvPvXKf61Q5TgQ=";
   };
 
-  patches = [
-    # Fix compilation error due to forceful header include
-    ./compat-fix.patch
-  ];
-
   nativeBuildInputs = [
+    cmake
     extra-cmake-modules
     kdoctools
-    wrapGAppsHook3
+    wrapQtAppsHook
   ];
 
   propagatedBuildInputs = [
@@ -39,9 +37,10 @@ stdenv.mkDerivation rec {
     kconfig
     kcrash
     kguiaddons
-    kinit
     kparts
     kwindowsystem
+    qt5compat
+    kstatusnotifieritem
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a6867e25b744..47410c2099bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1480,7 +1480,7 @@ with pkgs;
     inherit (libsForQt5) libqtpas wrapQtAppsHook;
   };
 
-  krusader = libsForQt5.callPackage ../applications/file-managers/krusader { };
+  krusader = kdePackages.callPackage ../applications/file-managers/krusader { };
 
   mc = callPackage ../applications/file-managers/mc {
     inherit (darwin) autoSignDarwinBinariesHook;