@@ -15701,6 +15701,12 @@ in
1570115701 suffix = "qt5";
1570215702 };
1570315703
15704+ poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
15705+ lcms = lcms2;
15706+ qt5Support = true;
15707+ suffix = "qt5";
15708+ };
15709+
1570415710 pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
1570515711
1570615712 qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
@@ -20623,13 +20629,10 @@ in
2062320629
2062420630 calibre = calibre-py3;
2062520631
20626− calligra = libsForQt514.callPackage ../applications/office/calligra {
20632+ calligra = libsForQt5.callPackage ../applications/office/calligra {
2062720633 openjpeg = openjpeg_1;
20628− poppler = poppler_0_61.override {
20629− qt5Support = true;
20630− # Must be using the same qt version as calligra itself.
20631− qtbase = qt514.qtbase;
20632− };
20634+ # Must use the same Qt version as Calligra itself:
20635+ poppler = libsForQt5.poppler_0_61;
2063320636 };
2063420637
2063520638 perkeep = callPackage ../applications/misc/perkeep { };