diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-02-10 01:01:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 20:01:21 -0500 |
| commit | 52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8 (patch) | |
| tree | f84ac34a4938f059b626848304b9e6a93ece2bc8 /pkgs/development/libraries | |
| parent | 69accc4d1470a17d7f1100d2ef4ff17fb8db5fc9 (diff) | |
| download | nixpkgs-52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8.tar nixpkgs-52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8.tar.gz nixpkgs-52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8.tar.bz2 nixpkgs-52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8.tar.lz nixpkgs-52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8.tar.xz nixpkgs-52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8.tar.zst nixpkgs-52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8.zip | |
webkitgtk: revert "pull upstream fix for gcc-12" (#158814)
`nixpkgs/master` contains `2.34.5` version with patches applied. Merge of `master` into `staging-next` causes `webkitgtk` to fail to apply patches twice. This reverts commit a74a1f32517b61107bd28f3b54cd49a6fc8db82c to ease `master` merging.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ad8711cb9dd..e9026d46bc6 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , runCommand , fetchurl -, fetchpatch , perl , python3 , ruby @@ -83,30 +82,6 @@ stdenv.mkDerivation rec { inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch - - # Pull upstream patches for missing includes on gcc-12: - # https://trac.webkit.org/changeset/288379/webkit - (fetchpatch { - name = "exchange-gcc-12.patch"; - url = "https://github.com/WebKit/WebKit/commit/198b392130b8dd625f4d5d36e652954eececb16b.patch"; - excludes = [ - "Source/JavaScriptCore/ChangeLog" - "Source/WTF/ChangeLog" - "Source/WebCore/ChangeLog" - "Tools/ChangeLog" - - "Tools/ImageDiff/ImageDiff.cpp" - ]; - sha256 = "sha256-D+wxfM8AEMBfvpghrwa5v9cYLyK5+Sab3J0RE/xVar8="; - }) - (fetchpatch { - name = "string-gcc-12.patch"; - url = "https://github.com/WebKit/WebKit/commit/4e3fade6bd89347e041a1938d4ea85fee14e5534.patch"; - excludes = [ - "Source/WTF/ChangeLog" - ]; - sha256 = "sha256-NPqZLfMUR6InQuqfVwNoZwuM3Jtbz5KAbm9SUBaprmc="; - }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' |