diff options
| author | Elias Probst <mail@eliasprobst.eu> | 2021-09-29 23:38:56 +0200 |
|---|---|---|
| committer | Elias Probst <mail@eliasprobst.eu> | 2021-10-01 11:37:42 +0200 |
| commit | 5fffa34329d9a5a3d330b29d072a868dbe8a7495 (patch) | |
| tree | debde608d07cf170d78b534f736035a4f8618b30 /pkgs/development/libraries/qt-5 | |
| parent | 97bac832c3b776a3f547a556df02e73777b18d15 (diff) | |
| download | nixpkgs-5fffa34329d9a5a3d330b29d072a868dbe8a7495.tar nixpkgs-5fffa34329d9a5a3d330b29d072a868dbe8a7495.tar.gz nixpkgs-5fffa34329d9a5a3d330b29d072a868dbe8a7495.tar.bz2 nixpkgs-5fffa34329d9a5a3d330b29d072a868dbe8a7495.tar.lz nixpkgs-5fffa34329d9a5a3d330b29d072a868dbe8a7495.tar.xz nixpkgs-5fffa34329d9a5a3d330b29d072a868dbe8a7495.tar.zst nixpkgs-5fffa34329d9a5a3d330b29d072a868dbe8a7495.zip | |
qt5.qtbase: add patch from 363880 to fix MySQL support
Without this patch, a MariaDB upgrade to 10.6.3 will break Qt's MySQL support, as it was using version-based feature flags instead of functional tests. This breaks the conversion of QDateTime values in queries, resulting in the breakage of e.g. Akonadi. Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 3b8540ca68f..5fd02b18a9e 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -111,6 +111,11 @@ let url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=049e14870c13235cd066758f29c42dc96c1ccdf8"; sha256 = "1cb2hwi859hds0fa2cbap014qaa7mah9p0rcxcm2cvj2ybl33qfc"; }) + (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/363880/3 is included in an release. + name = "qtbase-mysql-version-vs-functionality-check.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=211369133cf40b2f522caaff259c19069ed23ca4"; + sha256 = "19kq9h10qm344fpdqa9basrbzh1y5kr48c6jzz3nvk61pk4ja1k4"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; |