diff options
| author | Milan Pässler <mil@nyantec.com> | 2019-11-24 10:26:17 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-11-24 11:54:39 +0100 |
| commit | 2a2d3de78c950d46922f9aa13c3ff531cb142310 (patch) | |
| tree | e1c67a15d32bfa1032fdd088c3f0a61c72bcd322 | |
| parent | 02589d9b783e4e35125050851f92732e1ce35842 (diff) | |
| download | nixlib-2a2d3de78c950d46922f9aa13c3ff531cb142310.tar nixlib-2a2d3de78c950d46922f9aa13c3ff531cb142310.tar.gz nixlib-2a2d3de78c950d46922f9aa13c3ff531cb142310.tar.bz2 nixlib-2a2d3de78c950d46922f9aa13c3ff531cb142310.tar.lz nixlib-2a2d3de78c950d46922f9aa13c3ff531cb142310.tar.xz nixlib-2a2d3de78c950d46922f9aa13c3ff531cb142310.tar.zst nixlib-2a2d3de78c950d46922f9aa13c3ff531cb142310.zip | |
qt5: remove patch merged in 5.12.6
Patch for CVE-2019-13720 is included since QT 5.12.6, so it is unnecessary now.
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 0a37b1ce39a3..8d27f3a0d4ba 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -80,15 +80,6 @@ let url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951"; sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am"; }) - # patch for CVE-2019-13720, can be removed when it is included in the next upstream release - # https://bugreports.qt.io/browse/QTBUG-1019226 - (fetchpatch { - name = "qtwebengine-CVE-2019-13720.patch"; - url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=d6e5fc10"; - sha256 = "0ywc12m196pr6xn7l5xbascihygkjj4pbcgcn9wxvi5ssdr6z46z"; - extraPrefix = "src/3rdparty/"; - stripLen = 1; - }) ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; qtwebkit = [ ./qtwebkit.patch ] |