diff options
| author | IvarWithoutBones <ivar.scholten@protonmail.com> | 2021-07-14 16:12:24 +0200 |
|---|---|---|
| committer | IvarWithoutBones <ivar.scholten@protonmail.com> | 2021-07-14 16:12:24 +0200 |
| commit | a13ae31c53631a8ad2f51bb0e32de87afc46e3b0 (patch) | |
| tree | 96a57842421d324ab5c9e76b9ddf37deffe89d8f /pkgs/development/libraries/qt-5/5.15/default.nix | |
| parent | d04431fc022719cb314c3e41c0d75237e4f6e3ea (diff) | |
| download | nixpkgs-a13ae31c53631a8ad2f51bb0e32de87afc46e3b0.tar nixpkgs-a13ae31c53631a8ad2f51bb0e32de87afc46e3b0.tar.gz nixpkgs-a13ae31c53631a8ad2f51bb0e32de87afc46e3b0.tar.bz2 nixpkgs-a13ae31c53631a8ad2f51bb0e32de87afc46e3b0.tar.lz nixpkgs-a13ae31c53631a8ad2f51bb0e32de87afc46e3b0.tar.xz nixpkgs-a13ae31c53631a8ad2f51bb0e32de87afc46e3b0.tar.zst nixpkgs-a13ae31c53631a8ad2f51bb0e32de87afc46e3b0.zip | |
libsForQt515.qtbase: fix gcc11 compatibility
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.15/default.nix')
| -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 5cfca8d80c7..a8ba5128665 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -115,6 +115,11 @@ let ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch ./qtbase.patch.d/0010-qtbase-assert.patch ./qtbase.patch.d/0011-fix-header_module.patch + (fetchpatch { # This can be removed when https://codereview.qt-project.org/c/qt/qtbase/+/339323 is included in an release. + name = "0014-gcc11-compat.patch"; + url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=049e14870c13235cd066758f29c42dc96c1ccdf8"; + sha256 = "1cb2hwi859hds0fa2cbap014qaa7mah9p0rcxcm2cvj2ybl33qfc"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; |