Merge pull request #17492 from k0ral/webkit
webkitgtk: 2.10.4 -> 2.10.9
This commit is contained in:
commit
b7a4ef1a87
|
@ -13,7 +13,7 @@ assert stdenv.isDarwin -> !enableCredentialStorage;
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "webkitgtk-${version}";
|
name = "webkitgtk-${version}";
|
||||||
version = "2.10.4";
|
version = "2.10.9";
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
description = "Web content rendering engine, GTK+ port";
|
description = "Web content rendering engine, GTK+ port";
|
||||||
|
@ -28,17 +28,11 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||||
sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v";
|
sha256 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./finding-harfbuzz-icu.patch
|
./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;
|
] ++ optional stdenv.isDarwin ./adding-libintl.patch;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
|
@ -9643,10 +9643,7 @@ in
|
||||||
|
|
||||||
wcslib = callPackage ../development/libraries/wcslib { };
|
wcslib = callPackage ../development/libraries/wcslib { };
|
||||||
|
|
||||||
webkitgtk = callPackage ../development/libraries/webkitgtk {
|
webkitgtk = webkitgtk212x;
|
||||||
harfbuzz = harfbuzz-icu;
|
|
||||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
|
||||||
};
|
|
||||||
|
|
||||||
webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
|
webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
|
||||||
harfbuzz = harfbuzz-icu;
|
harfbuzz = harfbuzz-icu;
|
||||||
|
@ -9659,6 +9656,11 @@ in
|
||||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
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 {
|
webkitgtk2 = webkitgtk24x.override {
|
||||||
withGtk2 = true;
|
withGtk2 = true;
|
||||||
enableIntrospection = false;
|
enableIntrospection = false;
|
||||||
|
|
Loading…
Reference in a new issue