qtwebkit: fix linux build with glib 2.68 (#122259)

authored by

Orivej Desh and committed by
GitHub
7c46cfbc 0c046159

+15
+5
pkgs/development/libraries/qt-5/5.12/default.nix
··· 98 98 url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; 99 99 sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; 100 100 }) 101 + (fetchpatch { 102 + name = "qtwebkit-glib-2.68.patch"; 103 + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; 104 + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; 105 + }) 101 106 ./qtwebkit.patch 102 107 ./qtwebkit-icu68.patch 103 108
+5
pkgs/development/libraries/qt-5/5.14/default.nix
··· 111 111 url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; 112 112 sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; 113 113 }) 114 + (fetchpatch { 115 + name = "qtwebkit-glib-2.68.patch"; 116 + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; 117 + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; 118 + }) 114 119 ./qtwebkit.patch 115 120 ./qtwebkit-icu68.patch 116 121 ] ++ optionals stdenv.isDarwin [
+5
pkgs/development/libraries/qt-5/5.15/default.nix
··· 135 135 url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; 136 136 sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; 137 137 }) 138 + (fetchpatch { 139 + name = "qtwebkit-glib-2.68.patch"; 140 + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; 141 + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; 142 + }) 138 143 ./qtwebkit.patch 139 144 ./qtwebkit-icu68.patch 140 145 ] ++ optionals stdenv.isDarwin [