public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webkitgtk: 2.14.11 -> 2.16.3

Browse Source
This commit is contained in:
Volth 2017-05-25 22:52:10 +00:00 committed by Nikolay Amiantov
parent 4f42804288
commit 3de90b259c
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.22/default.nix
View File

@ -45,7 +45,7 @@ let
hitori gnome-taquin hitori gnome-taquin
]; ];
inherit (pkgs) glib gtk2 webkitgtk214x gtk3 gtkmm3 libcanberra_gtk2 inherit (pkgs) glib gtk2 webkitgtk216x gtk3 gtkmm3 libcanberra_gtk2
clutter clutter-gst clutter_gtk cogl gtkvnc; clutter clutter-gst clutter_gtk cogl gtkvnc;
inherit (pkgs.gnome2) ORBit2; inherit (pkgs.gnome2) ORBit2;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
@ -56,7 +56,7 @@ let
gtkmm = gtkmm3; gtkmm = gtkmm3;
vala = pkgs.vala_0_32; vala = pkgs.vala_0_32;
gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
webkitgtk = webkitgtk214x; webkitgtk = webkitgtk216x;
# Simplify the nixos module and gnome packages # Simplify the nixos module and gnome packages
defaultIconTheme = adwaita-icon-theme; defaultIconTheme = adwaita-icon-theme;

4
pkgs/development/libraries/libproxy/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake { stdenv, lib, fetchFromGitHub, pkgconfig, cmake
, dbus, networkmanager, webkitgtk214x, pcre, python2 }: , dbus, networkmanager, webkitgtk216x, pcre, python2 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libproxy-${version}"; name = "libproxy-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];
buildInputs = [ dbus networkmanager webkitgtk214x pcre ]; buildInputs = [ dbus networkmanager webkitgtk216x pcre ];
cmakeFlags = [ cmakeFlags = [
"-DWITH_WEBKIT3=ON" "-DWITH_WEBKIT3=ON"

4
pkgs/development/libraries/webkitgtk/2.14.nix → pkgs/development/libraries/webkitgtk/2.16.nix
View File

@ -12,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.5"; version = "2.16.3";
meta = { meta = {
description = "Web content rendering engine, GTK+ port"; description = "Web content rendering engine, GTK+ port";
@ -42,7 +42,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 = "17rnjs7yl198bkghzcc2cgh30sb5i03irb6wag3xchwv7b1z3a1w"; sha256 = "04mmfxm8284zrlkrhkcn9gq1l4lpm1q6wwb5hyybj081v8qr2ki0";
}; };
# see if we can clean this up.... # see if we can clean this up....

2
pkgs/development/libraries/webkitgtk/PR-152650-2.patch
View File

@ -38,9 +38,9 @@ index 6b01f1a..b443d10 100644
- set(ENABLE_GTKDOC OFF) - set(ENABLE_GTKDOC OFF)
-endif () -endif ()
- -
set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk) set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit) set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
index 4c8237b..a628ae0 100644 index 4c8237b..a628ae0 100644
--- a/Tools/gtk/gtkdoc.py --- a/Tools/gtk/gtkdoc.py

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

@ -10344,7 +10344,7 @@ with pkgs;
wcslib = callPackage ../development/libraries/wcslib { }; wcslib = callPackage ../development/libraries/wcslib { };
webkitgtk = webkitgtk214x; webkitgtk = webkitgtk216x;
webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix { webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu; harfbuzz = harfbuzz-icu;
@ -10352,7 +10352,7 @@ with pkgs;
inherit (darwin) libobjc; inherit (darwin) libobjc;
}; };
webkitgtk214x = callPackage ../development/libraries/webkitgtk/2.14.nix { webkitgtk216x = callPackage ../development/libraries/webkitgtk/2.16.nix {
harfbuzz = harfbuzz-icu; harfbuzz = harfbuzz-icu;
gst-plugins-base = gst_all_1.gst-plugins-base; gst-plugins-base = gst_all_1.gst-plugins-base;
}; };