alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "webkitgtk: 2.16.6 -> 2.18.2"

Browse source 
This already went to staging, sorry

This reverts commit 288740ad69.
This commit is contained in:
Herwig Hochleitner 2017-10-28 13:52:25 +02:00
parent 43e020ac2f
commit 0d6822be2b
4 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/desktops/gnome-3/default.nix
View file

@ -45,7 +45,7 @@ let
hitori gnome-taquin hitori gnome-taquin
]; ];
inherit (pkgs) glib gtk2 webkitgtk 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,6 +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 = webkitgtk216x;
# Simplify the nixos module and gnome packages # Simplify the nixos module and gnome packages
defaultIconTheme = adwaita-icon-theme; defaultIconTheme = adwaita-icon-theme;

14
pkgs/development/libraries/webkitgtk/2.18.nix → pkgs/development/libraries/webkitgtk/2.16.nix
View file

@ -4,7 +4,7 @@
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
, libidn, libedit, readline, mesa, libintlOrEmpty , libidn, libedit, readline, mesa, libintlOrEmpty
, enableGeoLocation ? true, geoclue2, sqlite , enableGeoLocation ? true, geoclue2, sqlite
, gst-plugins-base, gst-plugins-bad , gst-plugins-base
}: }:
assert enableGeoLocation -> geoclue2 != null; assert enableGeoLocation -> geoclue2 != null;
@ -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.18.2"; version = "2.16.6";
meta = { meta = {
description = "Web content rendering engine, GTK+ port"; description = "Web content rendering engine, GTK+ port";
@ -42,12 +42,12 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz"; url = "http://webkitgtk.org/releases/${name}.tar.xz";
sha256 = "1ry8zvv6k01g9p7agg326n0ziqpqjxd49h5w1b2is6rjnpqv6k5i"; sha256 = "08abxbhi2n1pfby9f2c20z8mpmbvbs2z7vf0p5ckq4jkz46na8zw";
}; };
# see if we can clean this up.... # see if we can clean this up....
patches = [ ./finding-harfbuzz-icu.patch ./gstreamergl-2.17.patch ] patches = [ ./finding-harfbuzz-icu.patch ]
++ optionals stdenv.isDarwin [ ++ optionals stdenv.isDarwin [
./PR-152650-2.patch ./PR-152650-2.patch
./PR-153138.patch ./PR-153138.patch
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
# XXX: WebKit2 missing include path for gst-plugins-base. # XXX: WebKit2 missing include path for gst-plugins-base.
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0 -I${gst-plugins-bad}/include/gstreamer-1.0" NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
+ (optionalString stdenv.isDarwin " -lintl"); + (optionalString stdenv.isDarwin " -lintl");
nativeBuildInputs = [ nativeBuildInputs = [
@ -88,9 +88,9 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = libintlOrEmpty ++ [ buildInputs = libintlOrEmpty ++ [
gtk2 libwebp enchant libnotify gnutls pcre nettle libidn sqlite gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
gst-plugins-base gst-plugins-bad libxkbcommon epoxy at_spi2_core sqlite gst-plugins-base libxkbcommon epoxy at_spi2_core
] ++ optional enableGeoLocation geoclue2 ] ++ optional enableGeoLocation geoclue2
++ (with xlibs; [ libXdmcp libXt libXtst ]) ++ (with xlibs; [ libXdmcp libXt libXtst ])
++ optionals stdenv.isDarwin [ libedit readline mesa ] ++ optionals stdenv.isDarwin [ libedit readline mesa ]

6
pkgs/development/libraries/wxwidgets/3.0/default.nix
View file

@ -3,13 +3,13 @@
, withMesa ? true, mesa_glu ? null, mesa_noglu ? null , withMesa ? true, mesa_glu ? null, mesa_noglu ? null
, compat24 ? false, compat26 ? true, unicode ? true , compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true , withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk216x ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null , AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}: }:
assert withMesa -> mesa_glu != null && mesa_noglu != null; assert withMesa -> mesa_glu != null && mesa_noglu != null;
assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null; assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x) != null;
with stdenv.lib; with stdenv.lib;
@ -30,7 +30,7 @@ stdenv.mkDerivation {
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
gst-plugins-base GConf ] gst-plugins-base GConf ]
++ optional withMesa mesa_glu ++ optional withMesa mesa_glu
++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk216x)
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];

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

@ -10968,7 +10968,7 @@ with pkgs;
wcslib = callPackage ../development/libraries/wcslib { }; wcslib = callPackage ../development/libraries/wcslib { };
webkitgtk = webkitgtk218x; webkitgtk = webkitgtk216x;
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix { webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzz-icu-58; harfbuzz = harfbuzz-icu-58;
@ -10976,7 +10976,7 @@ with pkgs;
inherit (darwin) libobjc; inherit (darwin) libobjc;
}; };
webkitgtk218x = callPackage ../development/libraries/webkitgtk/2.18.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;
}; };