Merge pull request #110738 from matthewbauer/revert-96140

Revert "webkitgtk: enable WPE_RENDERER"
This commit is contained in:
Sandro 2021-01-26 00:27:19 +01:00 committed by GitHub
commit 04095230e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -51,8 +51,6 @@
, xdg-dbus-proxy , xdg-dbus-proxy
, substituteAll , substituteAll
, glib , glib
, libwpe
, libwpe-fdo
}: }:
assert enableGeoLocation -> geoclue2 != null; assert enableGeoLocation -> geoclue2 != null;
@ -122,8 +120,6 @@ stdenv.mkDerivation rec {
libsecret libsecret
libtasn1 libtasn1
libwebp libwebp
libwpe
libwpe-fdo
libxkbcommon libxkbcommon
libxml2 libxml2
libxslt libxslt
@ -158,6 +154,7 @@ stdenv.mkDerivation rec {
"-DENABLE_INTROSPECTION=ON" "-DENABLE_INTROSPECTION=ON"
"-DPORT=GTK" "-DPORT=GTK"
"-DUSE_LIBHYPHEN=OFF" "-DUSE_LIBHYPHEN=OFF"
"-DUSE_WPE_RENDERER=OFF"
] ++ optionals stdenv.isDarwin [ ] ++ optionals stdenv.isDarwin [
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF" "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
"-DENABLE_GTKDOC=OFF" "-DENABLE_GTKDOC=OFF"