diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-11-13 09:36:54 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-11-21 10:54:43 +0200 |
| commit | 983465f13a42075925f78c69950b79d4e41397b5 (patch) | |
| tree | 9abc4a3559316e5cec9a1d098f00f41bfd18a3d3 /pkgs/development/libraries/qt-5/5.15/default.nix | |
| parent | 4dc0a9a0a7f17a08e8a45195a02ebe24b0d91161 (diff) | |
| download | nixpkgs-983465f13a42075925f78c69950b79d4e41397b5.tar nixpkgs-983465f13a42075925f78c69950b79d4e41397b5.tar.gz nixpkgs-983465f13a42075925f78c69950b79d4e41397b5.tar.bz2 nixpkgs-983465f13a42075925f78c69950b79d4e41397b5.tar.lz nixpkgs-983465f13a42075925f78c69950b79d4e41397b5.tar.xz nixpkgs-983465f13a42075925f78c69950b79d4e41397b5.tar.zst nixpkgs-983465f13a42075925f78c69950b79d4e41397b5.zip | |
qt515.qtwebkit: unbreak :tada:
A copy of #96309 essentially - fix the build of it with bison-3.7.
Diffstat (limited to 'pkgs/development/libraries/qt-5/5.15/default.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index b4e3d681c74..b4486bf025d 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 ]; }; |