Merge pull request #107527 from ttuegel/frameworks-qt-5.15
Update packages to Qt 5.15 for KDE Frameworks 5.76
This commit is contained in:
commit
6b342809b1
@ -1,6 +1,7 @@
|
||||
{ mkDerivation
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, extra-cmake-modules
|
||||
, qtbase
|
||||
, boost
|
||||
@ -24,6 +25,15 @@ mkDerivation rec {
|
||||
sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Build with kontactinterface >= 5.14.42.
|
||||
# Remove after next release.
|
||||
(fetchpatch {
|
||||
url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";
|
||||
sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
extra-cmake-modules
|
||||
];
|
||||
@ -48,6 +58,5 @@ mkDerivation rec {
|
||||
maintainers = with maintainers; [ zraexy ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl2Plus;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
@ -15705,6 +15705,12 @@ in
|
||||
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 { };
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
|
||||
@ -20630,13 +20636,10 @@ in
|
||||
|
||||
calibre = calibre-py3;
|
||||
|
||||
calligra = libsForQt514.callPackage ../applications/office/calligra {
|
||||
calligra = libsForQt5.callPackage ../applications/office/calligra {
|
||||
openjpeg = openjpeg_1;
|
||||
poppler = poppler_0_61.override {
|
||||
qt5Support = true;
|
||||
# Must be using the same qt version as calligra itself.
|
||||
qtbase = qt514.qtbase;
|
||||
};
|
||||
# Must use the same Qt version as Calligra itself:
|
||||
poppler = libsForQt5.poppler_0_61;
|
||||
};
|
||||
|
||||
perkeep = callPackage ../applications/misc/perkeep { };
|
||||
@ -22308,14 +22311,14 @@ in
|
||||
|
||||
k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
|
||||
|
||||
kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
|
||||
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
|
||||
|
||||
kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
|
||||
kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
|
||||
llvmPackages = llvmPackages_10;
|
||||
};
|
||||
|
||||
kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
|
||||
kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
|
||||
kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
|
||||
kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
|
||||
python = python3;
|
||||
};
|
||||
|
||||
@ -24469,7 +24472,7 @@ in
|
||||
|
||||
tribler = callPackage ../applications/networking/p2p/tribler { };
|
||||
|
||||
trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
|
||||
|
||||
tudu = callPackage ../applications/office/tudu { };
|
||||
|
||||
@ -25284,7 +25287,7 @@ in
|
||||
|
||||
zam-plugins = callPackage ../applications/audio/zam-plugins { };
|
||||
|
||||
zanshin = libsForQt514.callPackage ../applications/office/zanshin {
|
||||
zanshin = libsForQt5.callPackage ../applications/office/zanshin {
|
||||
boost = boost160;
|
||||
};
|
||||
|
||||
@ -25623,7 +25626,7 @@ in
|
||||
|
||||
dhewm3 = callPackage ../games/dhewm3 {};
|
||||
|
||||
digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
|
||||
digikam = libsForQt5.callPackage ../applications/graphics/digikam {};
|
||||
|
||||
displaycal = callPackage ../applications/graphics/displaycal {};
|
||||
|
||||
@ -26509,10 +26512,9 @@ in
|
||||
lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
|
||||
|
||||
lxqt = recurseIntoAttrs (import ../desktops/lxqt {
|
||||
inherit qt5;
|
||||
inherit libsForQt5;
|
||||
inherit pkgs;
|
||||
inherit (lib) makeScope;
|
||||
inherit qt5 libsForQt5;
|
||||
});
|
||||
|
||||
mate = recurseIntoAttrs (callPackage ../desktops/mate { });
|
||||
|
Loading…
x
Reference in New Issue
Block a user