diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-04-27 22:50:17 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-04-27 22:50:17 +0200 |
commit | 51554cbbdbe6086da3b31fb803e9d725647052c3 (patch) | |
tree | f87001648969cd83afabd7b28714cf772957a822 /pkgs/applications/office | |
parent | 9b641584046b6e0e52775026218e54768c2f50d0 (diff) | |
parent | 4dfaf3893c3f3de902b8cd56264c0fe661d611fb (diff) |
Merge branch 'master' into staging-next-2022-04-23
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/calligra/default.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/office/kalendar/default.nix | 103 |
2 files changed, 16 insertions, 103 deletions
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 234d49102889c..e18c0f21ae3f7 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -30,7 +30,23 @@ mkDerivation rec { sha256 = "11dzrp9q05dmvnwp4vk4ihcibqcf4xyr0ijscpi716cyy730flma"; excludes = [ "CMakeLists.txt" ]; }) + # Fixes for building calligra with modern poppler[-qt5] + (fetchpatch { + name = "poppler-22.03.0.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/8f328bef497a9e3bc628e4e294c1a70b0c8b0eab/trunk/poppler-22.03.0.patch"; + sha256 = "sha256-bOTnQcavXF49LIshNgzhXhyoEjzLmQJC/U7hO5P0bfY="; + }) + # Fixes for building calligra with gcc11/c++17 + (fetchpatch { + name = "build_c++17_poppler.patch"; + url = "https://github.com/archlinux/svntogit-packages/raw/bbbe35f97eb1033798f1cf95d427890168598199/trunk/068cd9ae.patch"; + sha256 = "sha256-d9/ILwSeW+ov11DF191hzIaUafO/rjQrAeONwqDSKbA="; + }) ]; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace 'CMAKE_CXX_STANDARD 11' 'CMAKE_CXX_STANDARD 17' + ''; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/pkgs/applications/office/kalendar/default.nix b/pkgs/applications/office/kalendar/default.nix deleted file mode 100644 index 32cc2f5de57c7..0000000000000 --- a/pkgs/applications/office/kalendar/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ lib -, mkDerivation -, fetchFromGitLab -, cmake -, extra-cmake-modules -, makeWrapper - -, qtbase -, qtquickcontrols2 -, qtsvg -, qtlocation -, qtdeclarative -, qqc2-desktop-style - -, kirigami2 -, kdbusaddons -, ki18n -, kcalendarcore -, kconfigwidgets -, kwindowsystem -, kcoreaddons -, kcontacts -, kitemmodels -, kxmlgui -, knotifications -, kiconthemes -, kservice -, kmime -, kpackage -, eventviews -, calendarsupport - -, akonadi -, akonadi-search -, akonadi-contacts -, akonadi-calendar-tools -, kdepim-runtime -}: - -mkDerivation rec { - pname = "kalendar"; - version = "1.0.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "pim"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-kjtLVU+8wbIa7R6J1XOjuvS3AnJNngxNBCx24Dy1QzM="; - }; - - nativeBuildInputs = [ - cmake - extra-cmake-modules - makeWrapper - ]; - - buildInputs = [ - qtbase - qtquickcontrols2 - qtsvg - qtlocation - qtdeclarative - qqc2-desktop-style - - kirigami2 - kdbusaddons - ki18n - kcalendarcore - kconfigwidgets - kwindowsystem - kcoreaddons - kcontacts - kitemmodels - kxmlgui - knotifications - kiconthemes - kservice - kmime - kpackage - eventviews - calendarsupport - - akonadi-search - akonadi-contacts - akonadi-calendar-tools - kdepim-runtime - ]; - - propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ]; - postFixup = '' - wrapProgram "$out/bin/kalendar" \ - --prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}" - ''; - - meta = with lib; { - description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; - homepage = "https://invent.kde.org/pim/kalendar/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ chuangzhu ]; - platforms = platforms.linux; - }; -} |