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() - # include --#else // Pre KF-5.91 header layout -+#elif __has_include() // Pre KF-5.91 header layout - # include - #endif - - #if __has_include() - # include --#else // Pre KF-5.91 header layout -+#elif __has_include() // Pre KF-5.91 header layout - # include - #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;