From 1875a29c74f3ece7b955a266a02401701371eca5 Mon Sep 17 00:00:00 2001 From: ftk Date: Mon, 1 May 2023 13:11:17 +0300 Subject: [PATCH] krusader: 2.7.2 -> 2.8.0 --- .../file-managers/krusader/compat-fix.patch | 20 +++++++++++++++++++ .../file-managers/krusader/default.nix | 9 +++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create 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 new file mode 100644 index 000000000000..5411982b97ba --- /dev/null +++ b/pkgs/applications/file-managers/krusader/compat-fix.patch @@ -0,0 +1,20 @@ +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 b2639fe84984..ec7e47f896c6 100644 --- a/pkgs/applications/file-managers/krusader/default.nix +++ b/pkgs/applications/file-managers/krusader/default.nix @@ -15,13 +15,18 @@ mkDerivation rec { pname = "krusader"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - hash = "sha256-QaOaQ7PELdHR7K6obfMMr/agYf7MHWb2CFmyo8qXYQk="; + hash = "sha256-jkzwWpMYsLwbCUGBG5iLLyuwwEoNHjeZghKpGQzywpo="; }; + patches = [ + # Fix compilation error due to forceful header include + ./compat-fix.patch + ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools