Merge #16970: webkitgtk24x: 2.4.9 -> 2.4.11
This commit is contained in:
commit
d167bedb67
@ -15,7 +15,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.4.9";
|
version = "2.4.11";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Web content rendering engine, GTK+ port";
|
description = "Web content rendering engine, GTK+ port";
|
||||||
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||||
sha256 = "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg";
|
sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";
|
||||||
};
|
};
|
||||||
|
|
||||||
CC = "cc";
|
CC = "cc";
|
||||||
@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = with stdenv.lib; [
|
configureFlags = with stdenv.lib; [
|
||||||
"--disable-geolocation"
|
"--disable-geolocation"
|
||||||
|
"--disable-jit"
|
||||||
(optionalString enableIntrospection "--enable-introspection")
|
(optionalString enableIntrospection "--enable-introspection")
|
||||||
] ++ optional withGtk2 [
|
] ++ optional withGtk2 [
|
||||||
"--with-gtk=2.0"
|
"--with-gtk=2.0"
|
||||||
|
Loading…
Reference in New Issue
Block a user