From b3beab9f03a0bbf09d04151bdb497bde260810d1 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 3 Aug 2016 23:21:50 +0200 Subject: [PATCH] webkitgtk: 2.10.4 -> 2.10.9 --- .../libraries/webkitgtk/{default.nix => 2.10.nix} | 10 ++-------- pkgs/top-level/all-packages.nix | 10 ++++++---- 2 files changed, 8 insertions(+), 12 deletions(-) rename pkgs/development/libraries/webkitgtk/{default.nix => 2.10.nix} (86%) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/2.10.nix similarity index 86% rename from pkgs/development/libraries/webkitgtk/default.nix rename to pkgs/development/libraries/webkitgtk/2.10.nix index cf22eb3aadd..a76a19ad41d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/2.10.nix @@ -13,7 +13,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.10.4"; + version = "2.10.9"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -28,17 +28,11 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v"; + sha256 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv"; }; patches = [ ./finding-harfbuzz-icu.patch - (fetchpatch { - name = "glibc-isnan.patch"; - url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore" - + "/runtime/Options.cpp?format=diff&new=194518"; - sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm"; - }) ] ++ optional stdenv.isDarwin ./adding-libintl.patch; cmakeFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 747a53ddcc0..fe4c30fc15f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9643,10 +9643,7 @@ in wcslib = callPackage ../development/libraries/wcslib { }; - webkitgtk = callPackage ../development/libraries/webkitgtk { - harfbuzz = harfbuzz-icu; - gst-plugins-base = gst_all_1.gst-plugins-base; - }; + webkitgtk = webkitgtk212x; webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { harfbuzz = harfbuzz-icu; @@ -9659,6 +9656,11 @@ in gst-plugins-base = gst_all_1.gst-plugins-base; }; + webkitgtk210x = callPackage ../development/libraries/webkitgtk/2.10.nix { + harfbuzz = harfbuzz-icu; + gst-plugins-base = gst_all_1.gst-plugins-base; + }; + webkitgtk2 = webkitgtk24x.override { withGtk2 = true; enableIntrospection = false;