diff options
| author | ftk <ftk@users.noreply.github.com> | 2023-05-01 13:11:17 +0300 |
|---|---|---|
| committer | Emery Hemingway <ehmry@posteo.net> | 2023-11-26 16:53:44 +0200 |
| commit | 1875a29c74f3ece7b955a266a02401701371eca5 (patch) | |
| tree | c0b55be0148e6c55c137ee16353f360bfddd341b /pkgs/applications/file-managers/krusader | |
| parent | a8f393e6c1c80dc979e9209eea9eb4b75833df70 (diff) | |
krusader: 2.7.2 -> 2.8.0
Diffstat (limited to 'pkgs/applications/file-managers/krusader')
| -rw-r--r-- | pkgs/applications/file-managers/krusader/compat-fix.patch | 20 | ||||
| -rw-r--r-- | pkgs/applications/file-managers/krusader/default.nix | 9 |
2 files changed, 27 insertions, 2 deletions
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 0000000000000..5411982b97ba1 --- /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(<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 b2639fe849846..ec7e47f896c63 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 |