diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-20 11:47:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 11:47:12 +0200 |
| commit | 34606368ac1fe30335517f130f4e15d090676597 (patch) | |
| tree | 1483e84579f0e95260385620af02a0810c1a7379 /pkgs/applications/office | |
| parent | 79a058f06b22f6fd8c6793ce085486f8121912b3 (diff) | |
| parent | aa96ef34f4746ac7e6e7e87685987c55bdb3f944 (diff) | |
Merge pull request #172733 from andrevmatos/kde/gear
kde/gear: 22.04.0 -> 22.04.1
Diffstat (limited to 'pkgs/applications/office')
| -rw-r--r-- | pkgs/applications/office/calligra/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index e18c0f21ae3f7..57b23ea95d164 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -30,18 +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="; }) + # Fixes for building calligra with modern poppler[-qt5] + (fetchpatch { + name = "calligra-poppler-22.03.patch"; + url = "https://invent.kde.org/office/calligra/-/commit/236bacbe13739414e919de868283b0caf2df5d8a.patch"; + sha256 = "sha256-9DmKPCvEFy2Cs3g7350iOCF5Vrx1HL+/8jr+Tb44CyE="; + }) + (fetchpatch { + name = "calligra-poppler-22.04.patch"; + url = "https://invent.kde.org/office/calligra/-/commit/6b75bec784c9835c78993349845d8c2ef22ec3de.patch"; + sha256 = "sha256-z9/4he4x0WN2K/ZGrDAAtHF/W5X1PAtpeO6s7fgL/fA="; + }) ]; postPatch = '' substituteInPlace CMakeLists.txt \ |