diff options
| author | Orivej Desh <orivej@gmx.fr> | 2021-05-09 04:55:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-09 04:55:05 +0000 |
| commit | 7c46cfbc026db51374b9f02a6b9dcc342fc60a2c (patch) | |
| tree | 98149d847605c3cb5e5d412f36d4d513ac5b6851 /pkgs/development/libraries/qt-5 | |
| parent | 0c04615963883bca35d8d97069c60dbe1af5cac0 (diff) | |
| download | nixpkgs-7c46cfbc026db51374b9f02a6b9dcc342fc60a2c.tar nixpkgs-7c46cfbc026db51374b9f02a6b9dcc342fc60a2c.tar.gz nixpkgs-7c46cfbc026db51374b9f02a6b9dcc342fc60a2c.tar.bz2 nixpkgs-7c46cfbc026db51374b9f02a6b9dcc342fc60a2c.tar.lz nixpkgs-7c46cfbc026db51374b9f02a6b9dcc342fc60a2c.tar.xz nixpkgs-7c46cfbc026db51374b9f02a6b9dcc342fc60a2c.tar.zst nixpkgs-7c46cfbc026db51374b9f02a6b9dcc342fc60a2c.zip | |
qtwebkit: fix linux build with glib 2.68 (#122259)
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.14/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/default.nix | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 63e893ea69f..fcb6297f519 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -98,6 +98,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 3e3790ed1a4..02b170e0eb1 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -111,6 +111,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index f969254b595..9712914c9ec 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -135,6 +135,11 @@ let url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; }) + (fetchpatch { + name = "qtwebkit-glib-2.68.patch"; + url = "https://github.com/qtwebkit/qtwebkit/pull/1058/commits/5b698ba3faffd4e198a45be9fe74f53307395e4b.patch"; + sha256 = "0a3xv0h4lv8wggckgy8cg8xnpkg7n9h45312pdjdnnwy87xvzss0"; + }) ./qtwebkit.patch ./qtwebkit-icu68.patch ] ++ optionals stdenv.isDarwin [ |