diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-23 14:30:18 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 14:30:18 +0200 |
commit | 5bd0c66364512d1d8b36e49d6c8ad150f8128fc2 (patch) | |
tree | 1efb861136a1812a8083a6e1a207dce307da79e1 | |
parent | 88ac1e707f0b67339840eafeee016b3840f1581a (diff) | |
parent | a13ae31c53631a8ad2f51bb0e32de87afc46e3b0 (diff) | |
download | nixpkgs-5bd0c66364512d1d8b36e49d6c8ad150f8128fc2.tar nixpkgs-5bd0c66364512d1d8b36e49d6c8ad150f8128fc2.tar.gz nixpkgs-5bd0c66364512d1d8b36e49d6c8ad150f8128fc2.tar.bz2 nixpkgs-5bd0c66364512d1d8b36e49d6c8ad150f8128fc2.tar.lz nixpkgs-5bd0c66364512d1d8b36e49d6c8ad150f8128fc2.tar.xz nixpkgs-5bd0c66364512d1d8b36e49d6c8ad150f8128fc2.tar.zst nixpkgs-5bd0c66364512d1d8b36e49d6c8ad150f8128fc2.zip |
Merge pull request #130053 from IvarWithoutBones/fix/qtbase-gcc11
-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 5d8688cfdc7..1bd1b563350 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 ]; |