Merge pull request #18850 from groxxda/webkitgtk
webkitgtk: remove 2.10.x, add 2.14.x
This commit is contained in:
Luca Bruno
GitHub
commit
c42c908f32
@ -1,86 +0,0 @@
|
||||
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, cmake
|
||||
, pkgconfig, gettext, gobjectIntrospection, libnotify
|
||||
, gtk2, gtk3, wayland, libwebp, enchant
|
||||
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
|
||||
, enableGeoLocation ? false, geoclue2, sqlite, xorg
|
||||
, enableCredentialStorage ? !stdenv.isDarwin
|
||||
, gst-plugins-base, readline, libedit
|
||||
}:
|
||||
|
||||
assert enableGeoLocation -> geoclue2 != null;
|
||||
assert stdenv.isDarwin -> !enableCredentialStorage;
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "webkitgtk-${version}";
|
||||
version = "2.10.9";
|
||||
|
||||
meta = {
|
||||
description = "Web content rendering engine, GTK+ port";
|
||||
homepage = "http://webkitgtk.org/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ koral ];
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs Tools";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||
sha256 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./finding-harfbuzz-icu.patch
|
||||
] ++ optional stdenv.isDarwin ./adding-libintl.patch;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORT=GTK"
|
||||
"-DUSE_LIBHYPHEN=OFF"
|
||||
] ++ optionals (!enableCredentialStorage) [
|
||||
"-DENABLE_CREDENTIAL_STORAGE=OFF"
|
||||
] ++ optionals (!enableGeoLocation) [
|
||||
"-DENABLE_GEOLOCATION=OFF"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
"-DENABLE_WEBKIT=ON"
|
||||
"-DENABLE_X11_TARGET=OFF"
|
||||
"-DENABLE_QUARTZ_TARGET=ON"
|
||||
"-DENABLE_TOOLS=ON"
|
||||
"-DENABLE_MINIBROWSER=ON"
|
||||
"-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
|
||||
"-DENABLE_VIDEO=OFF"
|
||||
"-DENABLE_WEB_AUDIO=OFF"
|
||||
"-DENABLE_OPENGL=OFF"
|
||||
"-DENABLE_INTROSPECTION=OFF"
|
||||
"-DUSE_LIBNOTIFY=OFF"
|
||||
"-DCMAKE_SHARED_LINKER_FLAGS=-L/path/to/nonexistent/folder"
|
||||
];
|
||||
|
||||
# XXX: WebKit2 missing include path for gst-plugins-base.
|
||||
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
|
||||
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake perl python ruby bison gperf sqlite
|
||||
pkgconfig gettext gobjectIntrospection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2 libwebp enchant libnotify
|
||||
libxml2 libxslt harfbuzz libpthreadstubs
|
||||
gst-plugins-base xorg.libXt
|
||||
] ++ optionals enableCredentialStorage [
|
||||
libsecret
|
||||
] ++ (if stdenv.isDarwin then [
|
||||
readline libedit
|
||||
] else [
|
||||
wayland
|
||||
]) ++ optional enableGeoLocation geoclue2;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsoup gtk3
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
63
pkgs/development/libraries/webkitgtk/2.14.nix
Normal file
63
pkgs/development/libraries/webkitgtk/2.14.nix
Normal file
@ -0,0 +1,63 @@
|
||||
{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
|
||||
, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
|
||||
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
|
||||
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
|
||||
, enableGeoLocation ? true, geoclue2, sqlite
|
||||
, gst-plugins-base
|
||||
}:
|
||||
|
||||
assert enableGeoLocation -> geoclue2 != null;
|
||||
|
||||
with stdenv.lib;
|
||||
stdenv.mkDerivation rec {
|
||||
name = "webkitgtk-${version}";
|
||||
version = "2.14.0";
|
||||
|
||||
meta = {
|
||||
description = "Web content rendering engine, GTK+ port";
|
||||
homepage = "http://webkitgtk.org/";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
hydraPlatforms = [];
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
preConfigure = "patchShebangs Tools";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://webkitgtk.org/releases/${name}.tar.xz";
|
||||
sha256 = "02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5";
|
||||
};
|
||||
|
||||
# see if we can clean this up....
|
||||
|
||||
patches = [ ./finding-harfbuzz-icu.patch ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DPORT=GTK"
|
||||
"-DUSE_LIBHYPHEN=0"
|
||||
"-DENABLE_GLES2=ON"
|
||||
];
|
||||
|
||||
# XXX: WebKit2 missing include path for gst-plugins-base.
|
||||
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
|
||||
#NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake perl python ruby bison gperf sqlite
|
||||
pkgconfig gettext gobjectIntrospection
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gtk2 wayland libwebp enchant libnotify gnutls
|
||||
libxml2 libsecret libxslt harfbuzz libpthreadstubs
|
||||
gst-plugins-base libxkbcommon epoxy at_spi2_core
|
||||
] ++ optional enableGeoLocation geoclue2
|
||||
++ (with xlibs; [ libXdmcp libXt libXtst ]);
|
||||
|
||||
propagatedBuildInputs = [
|
||||
libsoup gtk3
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
}
|
||||
@ -9812,12 +9812,12 @@ in
|
||||
inherit (darwin) libobjc;
|
||||
};
|
||||
|
||||
webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {
|
||||
webkitgtk214x = callPackage ../development/libraries/webkitgtk/2.14.nix {
|
||||
harfbuzz = harfbuzz-icu;
|
||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
||||
};
|
||||
|
||||
webkitgtk210x = callPackage ../development/libraries/webkitgtk/2.10.nix {
|
||||
webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix {
|
||||
harfbuzz = harfbuzz-icu;
|
||||
gst-plugins-base = gst_all_1.gst-plugins-base;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user