git.iko.soy/typeable/nixpkgs
on master help sign in
qt514.qtwebengine: fix build with gcc10
commitff612c5e560bdacef90f68f750cb6779555b996b authorOrivej Desh <orivej@gmx.fr> dateTue 5 Jan 2021, 16:48 (6 years ago) parent6b03963
1 file changed+16
pkgs/development/libraries/qt-5/5.14/default.nix+16
pkgs/development/libraries/qt-5/5.14/default.nix+16
@@ -87,6 +87,22 @@ let
8787 stripLen = 1;
8888 extraPrefix = "src/3rdparty/";
8989 })
90+ # Fix build with GCC 10 (part 1): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=fad3e27b
91+ (fetchpatch {
92+ name = "qtwebengine-gcc10-part1.patch";
93+ url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=fad3e27bfb50d1e23a07577f087a826b5e00bb1d";
94+ sha256 = "0c55j9zww8jyif6wl7jy1qqidgw9fdhiyfjgzhzi85r716m4pwwd";
95+ stripLen = 1;
96+ extraPrefix = "src/3rdparty/";
97+ })
98+ # Fix build with GCC 10 (part 2): https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=193c5bed
99+ (fetchpatch {
100+ name = "qtwebengine-gcc10-part2.patch";
101+ url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=193c5bed1cff123e21b7e6d12f464d6709ace2e3";
102+ sha256 = "1jb6s32ara6l4rbn4h3gg95mzv8sd8dl1zpjaqwywf1w7p8ymk86";
103+ stripLen = 1;
104+ extraPrefix = "src/3rdparty/";
105+ })
90106 ]
91107 ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
92108 qtwebkit = [