diff options
| author | Fabian Möller <fabianm88@gmail.com> | 2020-08-25 20:13:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-25 20:13:45 +0200 |
| commit | 90db9641cb072c48e2558a592b3c74f912213a8e (patch) | |
| tree | 122e3933f16407ed2199183e7214758e1ced9a95 | |
| parent | 28aef45a1aaf9b74ca2f5f1d015b687fee92a080 (diff) | |
qt5.qtwebengine: fix build with bison-3.7 (#96295)
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index c0db5915b947d..40b2d6837c533 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -15,7 +15,7 @@ , gn , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null -, lib, stdenv +, lib, stdenv, fetchpatch }: with stdenv.lib; @@ -38,6 +38,17 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; + patches = [ + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ]; + postPatch = # Patch Chromium build tools '' |