Skip to content

libsForQt5.messagelib: add patch for compatibility with cmake 3.24 #186967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 2 commits into from
Aug 18, 2022
Merged

libsForQt5.messagelib: add patch for compatibility with cmake 3.24 #186967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5330dd
libsForQt5.messagelib: add patch for compatibility with cmake 3.24
NickCao Aug 16, 2022
ef640cb
Revert "cmake_3_23: bring this version back (temporarily, I hope)"
NickCao Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions pkgs/applications/kde/messagelib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
mkDerivation, lib, kdepimTeam,
cmake_3_23,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, akonadi-notes, akonadi-search, gpgme, grantlee,
grantleetheme, karchive, kcodecs, kconfig, kconfigwidgets, kcontacts,
kiconthemes, kidentitymanagement, kio, kjobwidgets, kldap,
kmailtransport, kmbox, kmime, kwindowsystem, libgravatar, libkdepim, libkleo,
pimcommon, qca-qt5, qtwebengine, syntax-highlighting
pimcommon, qca-qt5, qtwebengine, syntax-highlighting, fetchpatch
}:

mkDerivation {
Expand All @@ -15,7 +14,18 @@ mkDerivation {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ (extra-cmake-modules.override { cmake = cmake_3_23; }) kdoctools ];
patches = [
# fix compatibility with cmake 3.24
(fetchpatch {
url = "https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3.patch";
hash = "sha256-H0ayU81HxX5moHOQ3hDW7tg824oqK1p9atrBhuvZ8K8=";
})
(fetchpatch {
url = "https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c2.patch";
hash = "sha256-tBFWCfttjDjyQyWnKdhVfLY6QsixzqqYuvD77GVH080=";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
akonadi-notes akonadi-search gpgme grantlee grantleetheme karchive kcodecs
kconfig kconfigwidgets kiconthemes kio kjobwidgets kldap
Expand Down
168 changes: 0 additions & 168 deletions pkgs/development/tools/build-managers/cmake/3_23.nix
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15783,11 +15783,6 @@ with pkgs;
inherit (libsForQt5) qtbase wrapQtAppsHook;
};

cmake_3_23 = callPackage ../development/tools/build-managers/cmake/3_23.nix {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
inherit (libsForQt5) qtbase wrapQtAppsHook;
};

cmakeMinimal = callPackage ../development/tools/build-managers/cmake {
isBootstrap = true;
qtbase = null;
Expand Down