git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75043 from worldofpeace/webkitgtk-parallel

webkitgtk: cleanups

commit58cf77fbee0eedc11fabf6cb96248f1df7ec1ebb authorworldofpeace <worldofpeace@protonmail.ch> dateTue 10 Dec 2019, 23:52 (7 years ago) parent4315026c2ba06d
1 file changed+138−57
pkgs/development/libraries/webkitgtk/default.nix+138−57
pkgs/development/libraries/webkitgtk/default.nix+138−57
@@ -1,12 +1,56 @@
1−{ stdenv, fetchurl, perl, python2, ruby, bison, gperf, cmake, ninja
2−, pkgconfig, gettext, gobject-introspection, libnotify, gnutls, libgcrypt
3−, gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
4−, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
5−, libidn, libedit, readline, libGL, libGLU, libintl, openjpeg
6−, enableGeoLocation ? true, geoclue2, sqlite
7−, enableGtk2Plugins ? false, gtk2 ? null
8−, gst-plugins-base, gst-plugins-bad, woff2
9−, bubblewrap, libseccomp, xdg-dbus-proxy, substituteAll
1+{ stdenv
2+, fetchurl
3+, perl
4+, python3
5+, ruby
6+, bison
7+, gperf
8+, cmake
9+, ninja
10+, pkgconfig
11+, gettext
12+, gobject-introspection
13+, libnotify
14+, gnutls
15+, libgcrypt
16+, gtk3
17+, wayland
18+, libwebp
19+, enchant2
20+, xorg
21+, libxkbcommon
22+, epoxy
23+, at-spi2-core
24+, libxml2
25+, libsoup
26+, libsecret
27+, libxslt
28+, harfbuzz
29+, libpthreadstubs
30+, pcre
31+, nettle
32+, libtasn1
33+, p11-kit
34+, libidn
35+, libedit
36+, readline
37+, libGL
38+, libGLU
39+, libintl
40+, openjpeg
41+, enableGeoLocation ? true
42+, geoclue2
43+, sqlite
44+, enableGtk2Plugins ? false
45+, gtk2 ? null
46+, gst-plugins-base
47+, gst-plugins-bad
48+, woff2
49+, bubblewrap
50+, libseccomp
51+, xdg-dbus-proxy
52+, substituteAll
53+, gnome3
1054}:
1155
1256assert enableGeoLocation -> geoclue2 != null;
@@ -14,18 +58,12 @@ assert enableGtk2Plugins -> gtk2 != null;
1458assert stdenv.isDarwin -> !enableGtk2Plugins;
1559
1660with stdenv.lib;
61+
1762stdenv.mkDerivation rec {
1863 pname = "webkitgtk";
1964 version = "2.26.2";
2065
21− meta = {
22− description = "Web content rendering engine, GTK port";
23− homepage = https://webkitgtk.org/;
24− license = licenses.bsd2;
25− platforms = platforms.linux;
26− hydraPlatforms = [];
27− maintainers = with maintainers; [ ];
28− };
66+ outputs = [ "out" "dev" ];
2967
3068 src = fetchurl {
3169 url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
@@ -40,54 +78,97 @@ stdenv.mkDerivation rec {
4078 ./libglvnd-headers.patch
4179 ];
4280
43− postPatch = ''
44− patchShebangs .
45− '';
46−
47− cmakeFlags = [
48− "-DPORT=GTK"
49− "-DUSE_LIBHYPHEN=OFF"
50− "-DENABLE_INTROSPECTION=ON"
51− "-DUSE_WPE_RENDERER=OFF"
52− ]
53− ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
54− ++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
55− ++ optionals stdenv.isDarwin [
56− "-DUSE_SYSTEM_MALLOC=ON"
57− "-DUSE_ACCELERATE=0"
58− "-DENABLE_MINIBROWSER=OFF"
59− "-DENABLE_VIDEO=ON"
60− "-DENABLE_QUARTZ_TARGET=ON"
61− "-DENABLE_X11_TARGET=OFF"
62− "-DENABLE_OPENGL=OFF"
63− "-DENABLE_WEB_AUDIO=OFF"
64− "-DENABLE_WEBGL=OFF"
65− "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
66− "-DENABLE_GTKDOC=OFF"
67− ];
68−
6981 nativeBuildInputs = [
70− cmake ninja perl python2 ruby bison gperf
71− pkgconfig gettext gobject-introspection
82+ bison
83+ cmake
84+ gettext
85+ gobject-introspection
86+ gperf
87+ ninja
88+ perl
89+ pkgconfig
90+ python3
91+ ruby
7292 ];
7393
7494 buildInputs = [
75− libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
76− libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit openjpeg
77− sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
78− libGL libGLU
95+ at-spi2-core
96+ enchant2
97+ epoxy
98+ gnutls
99+ gst-plugins-bad
100+ gst-plugins-base
101+ harfbuzz
102+ libGL
103+ libGLU
104+ libgcrypt
105+ libidn
106+ libintl
107+ libnotify
108+ libpthreadstubs
109+ libsecret
110+ libtasn1
111+ libwebp
112+ libxkbcommon
113+ libxml2
114+ libxslt
115+ nettle
116+ openjpeg
117+ p11-kit
118+ pcre
119+ sqlite
120+ woff2
121+ ] ++ (with xorg; [
122+ libXdamage
123+ libXdmcp
124+ libXt
125+ libXtst
126+ ]) ++ optionals stdenv.isDarwin [
127+ libedit
128+ readline
129+ ] ++ optionals stdenv.isLinux [
130+ bubblewrap
131+ libseccomp
132+ wayland
133+ xdg-dbus-proxy
79134 ] ++ optional enableGeoLocation geoclue2
80− ++ optional enableGtk2Plugins gtk2
81− ++ (with xorg; [ libXdmcp libXt libXtst libXdamage ])
82− ++ optionals stdenv.isDarwin [ libedit readline ]
83− ++ optionals stdenv.isLinux [
84− wayland bubblewrap libseccomp xdg-dbus-proxy
85− ];
135+ ++ optional enableGtk2Plugins gtk2;
86136
87137 propagatedBuildInputs = [
88− libsoup gtk3
138+ gtk3
139+ libsoup
89140 ];
90141
91− outputs = [ "out" "dev" ];
142+ cmakeFlags = [
143+ "-DENABLE_INTROSPECTION=ON"
144+ "-DPORT=GTK"
145+ "-DUSE_LIBHYPHEN=OFF"
146+ "-DUSE_WPE_RENDERER=OFF"
147+ ] ++ optionals stdenv.isDarwin [
148+ "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
149+ "-DENABLE_GTKDOC=OFF"
150+ "-DENABLE_MINIBROWSER=OFF"
151+ "-DENABLE_OPENGL=OFF"
152+ "-DENABLE_QUARTZ_TARGET=ON"
153+ "-DENABLE_VIDEO=ON"
154+ "-DENABLE_WEBGL=OFF"
155+ "-DENABLE_WEB_AUDIO=OFF"
156+ "-DENABLE_X11_TARGET=OFF"
157+ "-DUSE_ACCELERATE=0"
158+ "-DUSE_SYSTEM_MALLOC=ON"
159+ ] ++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
160+ ++ optional stdenv.isLinux "-DENABLE_GLES2=ON";
161+
162+ postPatch = ''
163+ patchShebangs .
164+ '';
92165
166+ meta = {
167+ description = "Web content rendering engine, GTK port";
168+ homepage = https://webkitgtk.org/;
169+ license = licenses.bsd2;
170+ platforms = platforms.linux;
171+ hydraPlatforms = [];
172+ maintainers = gnome3.maintainers;
173+ };
93174}