swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-11-05 17:56:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

qt5.qtwebengine: fix build with bison-3.7 (#96295)

Browse source
This commit is contained in:
Fabian Möller 2020-08-25 20:13:45 +02:00 committed by GitHub
parent 28aef45a1a
commit 90db9641cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/libraries/qt-5/modules/qtwebengine.nix
View file

@ -15,7 +15,7 @@
, gn , gn
, cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin
, ffmpeg_3 ? null , ffmpeg_3 ? null
, lib, stdenv , lib, stdenv, fetchpatch
}: }:
with stdenv.lib; with stdenv.lib;
@ -38,6 +38,17 @@ qtModule {
# which cannot be set at the same time as -Wformat-security # which cannot be set at the same time as -Wformat-security
hardeningDisable = [ "format" ]; 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 = postPatch =
# Patch Chromium build tools # Patch Chromium build tools
'' ''