diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/webkitgtk/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/webkitgtk/default.nix | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 23307b0f36b7..d8b7bbc6d65b 100644 --- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , runCommand , fetchurl -, fetchpatch , perl , python3 , ruby @@ -22,7 +21,7 @@ , enchant2 , xorg , libxkbcommon -, epoxy +, libepoxy , at-spi2-core , libxml2 , libsoup @@ -65,7 +64,7 @@ assert enableGeoLocation -> geoclue2 != null; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.34.0"; + version = "2.34.3"; outputs = [ "out" "dev" ]; @@ -73,7 +72,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-iAyO5ib2cBn2dVfKCeWaI+zyReYPYXMhXxqII8sJrzQ="; + sha256 = "sha256-DS83qjLiGjbk3Vpc565c4nQ1wp1oA7liuMkMsMxJxS0="; }; patches = lib.optionals stdenv.isLinux [ @@ -83,26 +82,6 @@ stdenv.mkDerivation rec { inherit (addOpenGLRunpath) driverLink; }) ./libglvnd-headers.patch - ] ++ lib.optionals stdenv.isDarwin [ - # https://bugs.webkit.org/show_bug.cgi?id=225856 - (fetchpatch { - url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797"; - sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU="; - excludes = [ "Source/WebCore/ChangeLog" ]; - }) - - # https://bugs.webkit.org/show_bug.cgi?id=225850 - ./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774 - (fetchpatch { - url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776"; - sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ="; - excludes = [ "Source/WTF/ChangeLog" ]; - }) - (fetchpatch { - url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778"; - sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo="; - excludes = [ "Source/WebKit/ChangeLog" ]; - }) ]; preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -133,7 +112,7 @@ stdenv.mkDerivation rec { buildInputs = [ at-spi2-core enchant2 - epoxy + libepoxy gnutls gst-plugins-bad gst-plugins-base @@ -231,5 +210,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = teams.gnome.members; + broken = stdenv.isDarwin; }; } |