public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calligra: use qt515

Browse Source
This commit is contained in:
Thomas Tuegel 2020-12-13 14:03:53 -06:00
parent 1b750c41fc
commit 0937f24518
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/top-level/all-packages.nix
View File

@ -15701,6 +15701,12 @@ in
suffix = "qt5"; suffix = "qt5";
}; };
poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
lcms = lcms2;
qt5Support = true;
suffix = "qt5";
};
pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
@ -20623,13 +20629,10 @@ in
calibre = calibre-py3; calibre = calibre-py3;
calligra = libsForQt514.callPackage ../applications/office/calligra { calligra = libsForQt5.callPackage ../applications/office/calligra {
openjpeg = openjpeg_1; openjpeg = openjpeg_1;
poppler = poppler_0_61.override { # Must use the same Qt version as Calligra itself:
qt5Support = true; poppler = libsForQt5.poppler_0_61;
# Must be using the same qt version as calligra itself.
qtbase = qt514.qtbase;
};
}; };
perkeep = callPackage ../applications/misc/perkeep { }; perkeep = callPackage ../applications/misc/perkeep { };