MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 16:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #21583 from bendlas/update-webkitgtk

Browse source 
webkitgtk: make 2.14 the default
This commit is contained in:
Michael Raskin 2017-01-02 14:02:05 +00:00 committed by GitHub
commit 8b03a76e61
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/webkitgtk/2.14.nix
View file

@ -1,7 +1,8 @@
{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake { stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake
, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core , gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
, libidn
, enableGeoLocation ? true, geoclue2, sqlite , enableGeoLocation ? true, geoclue2, sqlite
, gst-plugins-base , gst-plugins-base
}: }:
@ -11,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "webkitgtk-${version}"; name = "webkitgtk-${version}";
version = "2.14.1"; version = "2.14.2";
meta = { meta = {
description = "Web content rendering engine, GTK+ port"; description = "Web content rendering engine, GTK+ port";
@ -26,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 = "1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f"; sha256 = "0mjmcxhafh6l6j062z2nwfqbbvfyx16iqrzrbajswijh23awpnrf";
}; };
# see if we can clean this up.... # see if we can clean this up....
@ -49,8 +50,8 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk2 wayland libwebp enchant libnotify gnutls gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn
libxml2 libsecret libxslt harfbuzz libpthreadstubs libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
gst-plugins-base libxkbcommon epoxy at_spi2_core gst-plugins-base libxkbcommon epoxy at_spi2_core
] ++ optional enableGeoLocation geoclue2 ] ++ optional enableGeoLocation geoclue2
++ (with xlibs; [ libXdmcp libXt libXtst ]); ++ (with xlibs; [ libXdmcp libXt libXtst ]);

2
pkgs/top-level/all-packages.nix
View file

@ -9646,7 +9646,7 @@ in
wcslib = callPackage ../development/libraries/wcslib { }; wcslib = callPackage ../development/libraries/wcslib { };
webkitgtk = webkitgtk212x; webkitgtk = webkitgtk214x;
webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu; harfbuzz = harfbuzz-icu;