public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qt5.qtwebengine: remove patch upstreamed in 5.12.2

Browse Source
This commit is contained in:
Milan Pässler 2020-12-12 15:51:52 +01:00 committed by Frederik Rietdijk
parent 1ab054fa5d
commit aa81ee843b
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/qt-5/5.15/default.nix
View File

@ -83,16 +83,7 @@ let
qtdeclarative = [ ./qtdeclarative.patch ]; qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ]; qtscript = [ ./qtscript.patch ];
qtserialport = [ ./qtserialport.patch ]; qtserialport = [ ./qtserialport.patch ];
qtwebengine = [ qtwebengine = [ ]
# 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/";
})
]
++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch;
qtwebkit = [ qtwebkit = [
(fetchpatch { (fetchpatch {