krusader: 2.8.1 -> 2.9.0 (#383971)

pkgs/applications/file-managers/krusader/compat-fix.patch

@@ -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
- 

pkgs/applications/file-managers/krusader/default.nix

@@ -1,37 +1,35 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   extra-cmake-modules,
   kdoctools,
-  wrapGAppsHook3,
   karchive,
   kconfig,
   kcrash,
   kguiaddons,
-  kinit,
   kparts,
   kwindowsystem,
+  cmake,
+  wrapQtAppsHook,
+  qt5compat,
+  kstatusnotifieritem,
 }:
 
-mkDerivation rec {
+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,16 +37,17 @@ mkDerivation rec {
     kconfig
     kcrash
     kguiaddons
-    kinit
     kparts
     kwindowsystem
+    qt5compat
+    kstatusnotifieritem
   ];
 
-  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";
   };
 }

pkgs/top-level/all-packages.nix

@@ -1478,7 +1478,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;