From a268c6049b26136a24296a3a5f53da86fb8e51aa Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 4 Sep 2018 15:20:20 +0200 Subject: [PATCH] =?UTF-8?q?webkitgtk:=202.20.5=20=E2=86=92=202.22.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/libraries/webkitgtk/{2.20.nix => default.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/development/libraries/webkitgtk/{2.20.nix => default.nix} (96%) diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/default.nix similarity index 96% rename from pkgs/development/libraries/webkitgtk/2.20.nix rename to pkgs/development/libraries/webkitgtk/default.nix index bb493d16a36..7eae5819daf 100644 --- a/pkgs/development/libraries/webkitgtk/2.20.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.20.5"; + version = "2.22.2"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "147r7an41920zl4x9srdva7fxvw2znjin5ldjkhay1cndv9gih0m"; + sha256 = "1flrbr8pzbrlwv09b4pmgh6vklw7jghd2lgrhcb72vl9s7a8fm1l"; }; patches = optionals stdenv.isDarwin [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b4ebd3ca2e..c8a25f0209e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12763,7 +12763,7 @@ with pkgs; inherit (darwin) libobjc; }; - webkitgtk220x = callPackage ../development/libraries/webkitgtk/2.20.nix { + webkitgtk220x = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; stdenv = overrideCC stdenv gcc6;