ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17492 from k0ral/webkit

Browse Source 
webkitgtk: 2.10.4 -> 2.10.9
This commit is contained in:
Joachim F 2016-08-05 16:40:00 +02:00 committed by GitHub
commit b7a4ef1a87
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/webkitgtk/default.nix → pkgs/development/libraries/webkitgtk/2.10.nix
View File

@ -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 = [

10
pkgs/top-level/all-packages.nix
View File

@ -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;