diff options
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 1 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index b4e3d681c749c..b4486bf025d73 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -88,11 +88,17 @@ let }) ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ ./qtwebkit.patch ] - ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; qttools = [ ./qttools.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index b31e57f38065e..3d9e72bb54fae 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -72,7 +72,6 @@ qtModule { preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; meta = { - broken = lib.versionAtLeast qtbase.version "5.15"; maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; }; } |