cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #75040 from worldofpeace/remove-terror-webkitgtk

Browse source 
🙈️ Remove webkitgtk24x
This commit is contained in:
worldofpeace 2019-12-06 22:02:50 -05:00 committed by GitHub
commit 0c8dadd9e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 52 additions and 405 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/applications/editors/emacs/25.nix
View file

@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d, fetchpatch
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
, withX ? !stdenv.isDarwin
, withGTK2 ? false, gtk2 ? null
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
, withXwidgets ? false, webkitgtk, wrapGAppsHook ? null, glib-networking ? null
, withCsrc ? true
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
, autoconf ? null, automake ? null, texinfo ? null
}:
assert (libXft != null) -> libpng != null; # probably a bug
@ -16,7 +16,7 @@ assert withGTK2 -> withX || stdenv.isDarwin;
assert withGTK3 -> withX || stdenv.isDarwin;
assert withGTK2 -> !withGTK3 && gtk2 != null;
assert withGTK3 -> !withGTK2 && gtk3 != null;
assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null;
assert withXwidgets -> withGTK3 && webkitgtk != null;
let
toolkit =
@ -46,10 +46,21 @@ stdenv.mkDerivation rec {
url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
})
] ++ [
# Backport patches so we can use webkitgtk with xwidgets.
(fetchpatch {
name = "0001-Omit-unnecessary-includes-from-xwidget-c.patch";
url = "https://github.com/emacs-mirror/emacs/commit/a36ed9b5e95afea5716256bac24d883263aefbaf.patch";
sha256 = "1j34c0vkj87il87xy1px23yk6bw73adpr7wqa79ncj89i4lc8qkb";
})
(fetchpatch {
name = "0002-xwidget-Use-WebKit2-API.patch";
url = "https://github.com/emacs-mirror/emacs/commit/d781662873f228b110a128f7a2b6583a4d5e0a3a.patch";
sha256 = "1lld56zi4cw2hmjxhhdcc0f07k8lbj32h10wcq4ml3asdwa31ryr";
})
];
nativeBuildInputs = [ pkgconfig ]
++ lib.optionals srcRepo [ autoconf automake texinfo ]
nativeBuildInputs = [ pkgconfig autoconf automake texinfo ]
++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
buildInputs =
@ -61,7 +72,7 @@ stdenv.mkDerivation rec {
++ lib.optional (withX && withGTK2) gtk2
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
++ lib.optional (stdenv.isDarwin && withX) cairo
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
++ lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
hardeningDisable = [ "format" ];
@ -75,7 +86,7 @@ stdenv.mkDerivation rec {
"--with-gif=no" "--with-tiff=no" ])
++ lib.optional withXwidgets "--with-xwidgets";
preConfigure = lib.optionalString srcRepo ''
preConfigure = ''
./autogen.sh
'' + ''
substituteInPlace lisp/international/mule-cmds.el \

45
pkgs/applications/networking/browsers/uzbl/default.nix
View file

@ -1,45 +0,0 @@
{ stdenv, fetchurl, pkgconfig, python3, makeWrapper
, webkitgtk, glib-networking, gsettings-desktop-schemas, python2Packages
}:
# This package needs python3 during buildtime,
# but Python 2 + packages during runtime.
stdenv.mkDerivation rec {
pname = "uzbl";
version = "0.9.0";
meta = with stdenv.lib; {
description = "Tiny externally controllable webkit browser";
homepage = "http://uzbl.org/";
license = licenses.gpl3;
platforms = platforms.linux;
maintainers = with maintainers; [ raskin dgonyeo ];
};
src = fetchurl {
name = "uzbl-v${version}.tar.gz";
url = "https://github.com/uzbl/uzbl/archive/v${version}.tar.gz";
sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k";
};
preConfigure = ''
makeFlags="$makeFlags PREFIX=$out"
makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
mkdir -p $out/${python3.sitePackages}/
export PYTHONPATH=$PYTHONPATH:$out/${python3.sitePackages}
'';
preFixup = ''
for f in $out/bin/*; do
wrapProgram $f \
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
done
'';
nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
buildInputs = [ gsettings-desktop-schemas webkitgtk ];
propagatedBuildInputs = with python2Packages; [ pygtk six ];
}

43
pkgs/applications/networking/browsers/vimprobable2/default.nix
View file

@ -1,43 +0,0 @@
{ stdenv, fetchurl, makeWrapper, glib-networking, gtk2, libsoup, libX11, perl,
pkgconfig, webkitgtk, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "1.4.2";
pname = "vimprobable2";
src = fetchurl {
url = "mirror://sourceforge/vimprobable/vimprobable2_${version}.tar.bz2";
sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ makeWrapper gtk2 libsoup libX11 perl webkitgtk gsettings-desktop-schemas ];
hardeningDisable = [ "format" ];
installFlags = "PREFIX=/ DESTDIR=$(out)";
preFixup = ''
wrapProgram "$out/bin/vimprobable2" \
--prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
meta = {
description = ''
Vimprobable is a web browser that behaves like the Vimperator plugin
available for Mozilla Firefox
'';
longDescription = ''
Vimprobable is a web browser that behaves like the Vimperator plugin
available for Mozilla Firefox. It is based on the WebKit engine (using
GTK bindings). The goal of Vimprobable is to build a completely
keyboard-driven, efficient and pleasurable browsing-experience. Its
featureset might be considered "minimalistic", but not as minimalistic as
being completely featureless.
'';
homepage = https://sourceforge.net/apps/trac/vimprobable;
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.aforemny ];
platforms = with stdenv.lib.platforms; linux;
};
}

6
pkgs/applications/networking/mailreaders/claws-mail/default.nix
View file

@ -1,7 +1,7 @@
{ config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook
, curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme
, libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2
, openldap, perl, pkgconfig, poppler, python, shared-mime-info
, glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical
# Build options
# TODO: A flag to build the manual.
@ -13,7 +13,6 @@
, enableNetworkManager ? config.networking.networkmanager.enable or false
, enablePgp ? true
, enablePluginArchive ? false
, enablePluginFancy ? false
, enablePluginNotificationDialogs ? true
, enablePluginNotificationSounds ? true
, enablePluginPdf ? false
@ -64,12 +63,10 @@ stdenv.mkDerivation rec {
++ optional enablePluginArchive libarchive
++ optional enablePluginNotificationSounds libcanberra-gtk2
++ optional enablePluginNotificationDialogs libnotify
++ optional enablePluginFancy libsoup
++ optional enablePluginRssyl libxml2
++ optional enableNetworkManager networkmanager
++ optional enableLdap openldap
++ optional enablePluginPdf poppler
++ optional enablePluginFancy webkitgtk24x-gtk2
++ optional enablePluginVcalendar libical;
configureFlags =
@ -81,7 +78,6 @@ stdenv.mkDerivation rec {
"--disable-pgpmime-plugin"
]
++ optional (!enablePluginArchive) "--disable-archive-plugin"
++ optional (!enablePluginFancy) "--disable-fancy-plugin"
++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin"
++ optional (!enablePluginPython) "--disable-python-plugin"
++ optional (!enablePluginRavatar) "--disable-libravatar-plugin"

13
pkgs/applications/office/mmex/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, sqlite, wxGTK30, gettext }:
{ stdenv, fetchgit, sqlite, wxGTK30, gettext, wrapGAppsHook }:
let
@ -14,7 +14,16 @@ in
sha256 = "0r4n93z3scv0i0zqflsxwv7j4yl8jy3gr0m4l30y1q8qv0zj9n74";
};
buildInputs = [ sqlite wxGTK30 gettext ];
nativeBuildInputs = [
wrapGAppsHook
];
buildInputs = [
gettext
sqlite
wxGTK30
wxGTK30.gtk
];
meta = {
description = "Easy-to-use personal finance software";

111
pkgs/development/libraries/webkitgtk/2.4.nix
View file

@ -1,111 +0,0 @@
{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, flex
, pkgconfig, which, gettext, gobject-introspection
, gtk2, gtk3, wayland, libwebp, enchant, sqlite
, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
, gst-plugins-base, libobjc
, withGtk2 ? false
, enableIntrospection ? !stdenv.isDarwin
, enableCredentialStorage ? !stdenv.isDarwin
, readline, libedit
}:
assert stdenv.isDarwin -> !enableIntrospection;
assert stdenv.isDarwin -> !enableCredentialStorage;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
version = "2.4.11";
meta = with stdenv.lib; {
description = "Web content rendering engine, GTK port";
homepage = http://webkitgtk.org/;
license = licenses.bsd2;
platforms = with platforms; linux ++ darwin;
maintainers = [];
knownVulnerabilities = [
"WSA-2016-0004"
"WSA-2016-0005"
"WSA-2016-0006"
"WSA-2017-0001"
"WSA-2017-0002"
];
};
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
sha256 = "1xsvnvyvlywwyf6m9ainpsg87jkxjmd37q6zgz9cxb7v3c2ym2jq";
};
CC = "cc";
prePatch = ''
patchShebangs Tools/gtk
'';
patches = [
./webcore-svg-libxml-cflags.patch
(fetchpatch {
url = https://raw.githubusercontent.com/gentoo/gentoo/7c5457e265bd40c156a8fe6b2ff94a4e34bcea8e/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch;
sha256 = "0ll93dr5vxd40wvly1jaw41lvw86krac0jc6k6cacrps4i5ql5j0";
})
] ++ optionals stdenv.isDarwin [
./configure.patch
./quartz-webcore.patch
./libc++.patch
./plugin-none.patch
] ++ optionals stdenv.hostPlatform.isMusl [
./fix-execinfo.patch
];
configureFlags = with stdenv.lib; [
"--disable-geolocation"
"--disable-jit"
# needed for parallel building
"--enable-dependency-tracking"
(optionalString enableIntrospection "--enable-introspection")
] ++ optional withGtk2 [
"--with-gtk=2.0"
] ++ optionals (withGtk2 || stdenv.isDarwin) [
"--disable-webkit2"
] ++ optionals stdenv.isDarwin [
"--disable-x11-target"
"--enable-quartz-target"
"--disable-web-audio"
"CFLAGS=-DJSC_OBJC_API_ENABLED=0"
"CXXFLAGS=-DJSC_OBJC_API_ENABLED=0"
] ++ optionals (!enableCredentialStorage) [
"--disable-credential-storage"
];
NIX_CFLAGS_COMPILE = [
"-DU_NOEXCEPT="
"-Wno-expansion-to-defined"
];
dontAddDisableDepTrack = true;
nativeBuildInputs = [
perl python ruby bison gperf flex
pkgconfig which gettext gobject-introspection
];
buildInputs = [
gtk2 libwebp enchant
libxml2 libxslt
gst-plugins-base sqlite xorg.libXt xorg.libXdamage
] ++ optionals enableCredentialStorage [
libsecret
] ++ (if stdenv.isDarwin then [
readline libedit libobjc
] else [
wayland
]);
propagatedBuildInputs = [
libsoup harfbuzz/*icu in *.la*/
(if withGtk2 then gtk2 else gtk3)
];
enableParallelBuilding = true;
}

20
pkgs/development/libraries/webkitgtk/configure.patch
View file

@ -1,20 +0,0 @@
--- webkitgtk-2.4.11-orig/configure 2016-04-10 17:00:06.000000000 +0800
+++ webkitgtk-2.4.11/configure 2016-07-21 23:04:10.000000000 +0800
@@ -17738,7 +17738,7 @@
cat >>confdefs.h <<_ACEOF
#define HAVE_WEBP_DECODE_H 1
_ACEOF
- WEBP_LIBS='-lwebp'
+ WEBP_LIBS=`$PKG_CONFIG --libs libwebp`
else
as_fn_error $? "WebP library (libwebp) not found" "$LINENO" 5
fi
@@ -18388,7 +18388,7 @@
case "$host" in
*-*-darwin*)
UNICODE_CFLAGS="-I$srcdir/Source/JavaScriptCore/icu -I$srcdir/Source/WebCore/icu"
- UNICODE_LIBS="-licucore"
+ UNICODE_LIBS="/usr/lib/libicucore.dylib"
;;
*-*-mingw*)

20
pkgs/development/libraries/webkitgtk/fix-execinfo.patch
View file

@ -1,20 +0,0 @@
--- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp
+++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp
@@ -64,7 +64,7 @@
#include <windows.h>
#endif
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
#include <cxxabi.h>
#include <dlfcn.h>
#include <execinfo.h>
@@ -242,7 +242,7 @@
void WTFGetBacktrace(void** stack, int* size)
{
-#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))
+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))
*size = backtrace(stack, *size);
#elif OS(WINDOWS) && !OS(WINCE)
// The CaptureStackBackTrace function is available in XP, but it is not defined

20
pkgs/development/libraries/webkitgtk/libc++.patch
View file

@ -1,20 +0,0 @@
--- webkitgtk-2.4.9-orig/GNUmakefile.in 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/GNUmakefile.in 2016-02-02 22:10:23.000000000 -0500
@@ -23321,7 +23321,7 @@
$(WINMM_LIBS) \
-lm \
-lpthread \
- -lstdc++
+ -lc++
Programs_minidom_LDFLAGS = \
-no-install
@@ -23344,7 +23344,7 @@
$(WINMM_LIBS) \
-lm \
-lpthread \
- -lstdc++
+ -lc++
Programs_LLIntOffsetsExtractor_LDFLAGS = \
-no-install

38
pkgs/development/libraries/webkitgtk/plugin-none.patch
View file

@ -1,38 +0,0 @@
--- webkitgtk-2.4.9-orig/GNUmakefile.in 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/GNUmakefile.in 2016-02-08 00:27:10.000000000 -0500
@@ -4799,6 +4799,8 @@
Source/WebCore/plugins/PluginViewBase.h \
Source/WebCore/plugins/PluginView.cpp \
Source/WebCore/plugins/PluginView.h \
+ Source/WebCore/plugins/PluginViewNone.cpp \
+ Source/WebCore/plugins/PluginPackageNone.cpp \
Source/WebCore/plugins/npapi.h \
Source/WebCore/plugins/npfunctions.h \
Source/WebCore/plugins/npruntime.h \
@@ -6375,6 +6377,8 @@
Source/WebCore/plugins/libWebCore_la-PluginPackage.lo \
Source/WebCore/plugins/libWebCore_la-PluginStream.lo \
Source/WebCore/plugins/libWebCore_la-PluginView.lo \
+ Source/WebCore/plugins/libWebCore_la-PluginViewNone.lo \
+ Source/WebCore/plugins/libWebCore_la-PluginPackageNone.lo \
Source/WebCore/rendering/libWebCore_la-AutoTableLayout.lo \
Source/WebCore/rendering/libWebCore_la-BidiRun.lo \
Source/WebCore/rendering/libWebCore_la-break_lines.lo \
@@ -10796,6 +10800,8 @@
Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginProcessConnectionManager.lo \
Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginProxy.lo \
Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginView.lo \
+ Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginViewNone.lo \
+ Source/WebKit2/WebProcess/Plugins/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-PluginPackageNone.lo \
Source/WebKit2/WebProcess/ResourceCache/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-WebResourceCacheManager.lo \
Source/WebKit2/WebProcess/Storage/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-StorageAreaImpl.lo \
Source/WebKit2/WebProcess/Storage/libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-StorageAreaMap.lo \
@@ -19503,6 +19509,8 @@
Source/WebCore/plugins/PluginViewBase.h \
Source/WebCore/plugins/PluginView.cpp \
Source/WebCore/plugins/PluginView.h \
+ Source/WebCore/plugins/PluginViewNone.cpp \
+ Source/WebCore/plugins/PluginPackageNone.cpp \
Source/WebCore/plugins/npapi.h \
Source/WebCore/plugins/npfunctions.h \
Source/WebCore/plugins/npruntime.h \

22
pkgs/development/libraries/webkitgtk/quartz-webcore.patch
View file

@ -1,22 +0,0 @@
--- webkitgtk-2.4.9-orig/Source/WebCore/plugins/PluginView.cpp 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/Source/WebCore/plugins/PluginView.cpp 2016-02-02 18:28:07.000000000 -0500
@@ -839,7 +839,7 @@
#if defined(XP_MACOSX)
, m_contextRef(0)
#endif
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
+#if defined(X11) && ENABLE(NETSCAPE_PLUGIN_API)
, m_hasPendingGeometryChange(true)
, m_drawable(0)
, m_visual(0)
--- webkitgtk-2.4.9-orig/Source/WebCore/plugins/PluginView.h 2016-02-02 13:23:23.000000000 -0500
+++ webkitgtk-2.4.9/Source/WebCore/plugins/PluginView.h 2016-02-02 18:26:37.000000000 -0500
@@ -378,7 +378,7 @@
void setNPWindowIfNeeded();
#endif
-#if defined(XP_UNIX) && ENABLE(NETSCAPE_PLUGIN_API)
+#if PLATFORM(X11) && ENABLE(NETSCAPE_PLUGIN_API)
bool m_hasPendingGeometryChange;
Pixmap m_drawable;
Visual* m_visual;

8
pkgs/development/libraries/webkitgtk/webcore-svg-libxml-cflags.patch
View file

@ -1,8 +0,0 @@
--- webkitgtk-2.2.3-orig/GNUmakefile.in 2013-12-04 17:56:28.000000000 +0800
+++ webkitgtk-2.2.3/GNUmakefile.in 2013-12-05 17:32:37.976689248 +0800
@@ -21911,6 +21911,7 @@
@ENABLE_SVG_TRUE@ $(CAIRO_CFLAGS) \
@ENABLE_SVG_TRUE@ $(FREETYPE_CFLAGS) \
@ENABLE_SVG_TRUE@ $(LIBSOUP_CFLAGS) \
+@ENABLE_SVG_TRUE@ $(LIBXML_CFLAGS) \
@ENABLE_SVG_TRUE@ $(UNICODE_CFLAGS)

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

@ -6,15 +6,16 @@
, libGLU ? null, libGL ? null
, compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
, withWebKit ? false, webkitgtk ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}:
with stdenv.lib;
assert withMesa -> libGLU != null && libGL != null;
assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
assert withWebKit -> webkitgtk != null;
with stdenv.lib;
assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2.";
stdenv.mkDerivation rec {
version = "3.0.4";
@ -31,7 +32,7 @@ stdenv.mkDerivation rec {
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa libGLU
++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
++ optional withWebKit webkitgtk
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
nativeBuildInputs = [ pkgconfig ];

9
pkgs/development/libraries/wxwidgets/3.1/default.nix
View file

@ -5,15 +5,16 @@
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
, compat28 ? false, compat30 ? true, unicode ? true
, withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
, withWebKit ? false, webkitgtk ? null
, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
}:
with stdenv.lib;
assert withMesa -> libGLU != null && libGL != null;
assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk) != null;
assert withWebKit -> webkitgtk != null;
with stdenv.lib;
assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK31: You cannot enable withWebKit when using withGtk2.";
stdenv.mkDerivation rec {
version = "3.1.2";
@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
[ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
gst-plugins-base GConf ]
++ optional withMesa libGLU
++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk)
++ optional withWebKit webkitgtk
++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
nativeBuildInputs = [ pkgconfig ];

27
pkgs/development/python-modules/pywebkitgtk/default.nix
View file

@ -1,27 +0,0 @@
{ stdenv
, buildPythonPackage
, fetchurl
, pkgs
, pygtk
}:
buildPythonPackage rec {
pname = "pywebkitgtk";
version = "1.1.8";
format = "other";
src = fetchurl {
url = "http://pywebkitgtk.googlecode.com/files/${pname}-${version}.tar.bz2";
sha256 = "1svlwyl61rvbqbcbalkg6pbf38yjyv7qkq9sx4x35yk69lscaac2";
};
nativeBuildInputs = [ pkgs.pkgconfig ];
buildInputs = [ pygtk pkgs.gtk2 pkgs.libxml2 pkgs.libxslt pkgs.libsoup pkgs.webkitgtk24x-gtk2 pkgs.icu ];
meta = with stdenv.lib; {
homepage = "https://code.google.com/p/pywebkitgtk/";
description = "Python bindings for the WebKit GTK port";
license = licenses.lgpl2Plus;
};
}

4
pkgs/tools/networking/mu/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe
, xapian, glib, gmime3, texinfo , emacs, guile
, gtk3, webkitgtk24x-gtk3, libsoup, icu
, gtk3, webkitgtk, libsoup, icu
, withMug ? false }:
stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [
sqlite xapian glib gmime3 texinfo emacs guile libsoup icu
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk24x-gtk3 ];
] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ];
nativeBuildInputs = [ pkgconfig autoreconfHook pmccabe ];

6
pkgs/top-level/aliases.nix
View file

@ -413,16 +413,20 @@ mapAliases ({
ultrastardx-beta = ultrastardx; # added 2017-08-12
usb_modeswitch = usb-modeswitch; # added 2016-05-10
usbguard-nox = usbguard; # added 2019-09-04
uzbl = throw "uzbl has been removed from nixpkgs, as it's unmaintained and uses insecure libraries";
v4l_utils = v4l-utils; # added 2019-08-07
v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages";
valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38";
vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01
vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05
vimprobable2-unwrapped = vimprobable2; # added 2019-12-05
virtviewer = virt-viewer; # added 2015-12-24
virtmanager = virt-manager; # added 2019-10-29
virtmanager-qt = virt-manager-qt; # added 2019-10-29
vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
webkitgtk24x-gtk3 = throw "webkitgtk24x-gtk3 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
webkitgtk24x-gtk2 = throw "webkitgtk24x-gtk2 has been removed because it's insecure. Please use webkitgtk."; # added 2019-12-05
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
wineStaging = wine-staging; # added 2018-01-08
winusb = woeusb; # added 2017-12-22

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

@ -14471,19 +14471,6 @@ in
stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947
};
webkitgtk24x-gtk3 = callPackage ../development/libraries/webkitgtk/2.4.nix {
harfbuzz = harfbuzzFull.override {
icu = icu58;
};
gst-plugins-base = gst_all_1.gst-plugins-base;
inherit (darwin) libobjc;
};
webkitgtk24x-gtk2 = webkitgtk24x-gtk3.override {
withGtk2 = true;
enableIntrospection = false;
};
websocketpp = callPackage ../development/libraries/websocket++ { };
webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { };
@ -20020,7 +20007,10 @@ in
MMA = callPackage ../applications/audio/MMA { };
mmex = callPackage ../applications/office/mmex {
wxGTK30 = wxGTK30.override { withWebKit = true ; };
wxGTK30 = wxGTK30.override {
withWebKit = true;
withGtk2 = false;
};
};
mmsd = callPackage ../tools/networking/mmsd { };
@ -21610,10 +21600,6 @@ in
uwimap = callPackage ../tools/networking/uwimap { };
uzbl = callPackage ../applications/networking/browsers/uzbl {
webkitgtk = webkitgtk24x-gtk2;
};
utox = callPackage ../applications/networking/instant-messengers/utox { };
valentina = libsForQt5.callPackage ../applications/misc/valentina { };
@ -25192,11 +25178,6 @@ in
llvmPackages = llvmPackages_6;
});
vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 {
webkitgtk = webkitgtk24x-gtk2;
};
vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { };
vimb = wrapFirefox vimb-unwrapped { };

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

@ -4850,8 +4850,6 @@ in {
pywal = callPackage ../development/python-modules/pywal { };
pywebkitgtk = callPackage ../development/python-modules/pywebkitgtk { };
pywinrm = callPackage ../development/python-modules/pywinrm { };
pyxattr = callPackage ../development/python-modules/pyxattr { };