webkitgtk: Try to fix build on Darwin
- Libmanette and systemd features need to be disabled since they depend on systemd. - FastMalloc for some reason does not include <malloc/malloc.h> so we added that. - <CommonCrypto/CommonRandom.h> depends on a type from <CommonCrypto/CommonCryptor.h> but does not include it for some reason, resulting in the following error: In file included from ../Source/WTF/wtf/RandomDevice.cpp:44: /nix/store/wd30p2pq4lci8fk9fqldkgk1hgmwpapj-Libsystem-1238.60.2/include/CommonCrypto/CommonRandom.h:35:9: error: unknown type name 'CCCryptorStatus' typedef CCCryptorStatus CCRNGStatus; - The GL-related flags were renamed and removed (in previous releases as well) so we switched to the new ones so that GL is still disabled. - Unrelatedly, `with` statement at the top of the expression is abomination so we narrowed its scope to just meta.
This commit is contained in:
parent
c05d8ea394
commit
702d3e2794
|
@ -57,8 +57,6 @@
|
||||||
|
|
||||||
assert enableGeoLocation -> geoclue2 != null;
|
assert enableGeoLocation -> geoclue2 != null;
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "webkitgtk";
|
pname = "webkitgtk";
|
||||||
version = "2.32.0";
|
version = "2.32.0";
|
||||||
|
@ -72,7 +70,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx";
|
sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = optionals stdenv.isLinux [
|
patches = lib.optionals stdenv.isLinux [
|
||||||
(substituteAll {
|
(substituteAll {
|
||||||
src = ./fix-bubblewrap-paths.patch;
|
src = ./fix-bubblewrap-paths.patch;
|
||||||
inherit (builtins) storeDir;
|
inherit (builtins) storeDir;
|
||||||
|
@ -85,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||||
# pick up the wrong gettext. TODO: Find a better solution for
|
# pick up the wrong gettext. TODO: Find a better solution for
|
||||||
# this, maybe make cmake not look up executables in
|
# this, maybe make cmake not look up executables in
|
||||||
# CMAKE_PREFIX_PATH.
|
# CMAKE_PREFIX_PATH.
|
||||||
cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin"
|
cmakeFlags+=" -DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
|
@ -118,7 +116,9 @@ stdenv.mkDerivation rec {
|
||||||
libgcrypt
|
libgcrypt
|
||||||
libidn
|
libidn
|
||||||
libintl
|
libintl
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
libmanette
|
libmanette
|
||||||
|
] ++ [
|
||||||
libnotify
|
libnotify
|
||||||
libpthreadstubs
|
libpthreadstubs
|
||||||
libsecret
|
libsecret
|
||||||
|
@ -138,16 +138,16 @@ stdenv.mkDerivation rec {
|
||||||
libXdmcp
|
libXdmcp
|
||||||
libXt
|
libXt
|
||||||
libXtst
|
libXtst
|
||||||
]) ++ optionals stdenv.isDarwin [
|
]) ++ lib.optionals stdenv.isDarwin [
|
||||||
libedit
|
libedit
|
||||||
readline
|
readline
|
||||||
] ++ optionals stdenv.isLinux [
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
bubblewrap
|
bubblewrap
|
||||||
libseccomp
|
libseccomp
|
||||||
systemd
|
systemd
|
||||||
wayland
|
wayland
|
||||||
xdg-dbus-proxy
|
xdg-dbus-proxy
|
||||||
] ++ optional enableGeoLocation geoclue2;
|
] ++ lib.optional enableGeoLocation geoclue2;
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
gtk3
|
gtk3
|
||||||
|
@ -159,27 +159,34 @@ stdenv.mkDerivation rec {
|
||||||
"-DPORT=GTK"
|
"-DPORT=GTK"
|
||||||
"-DUSE_LIBHYPHEN=OFF"
|
"-DUSE_LIBHYPHEN=OFF"
|
||||||
"-DUSE_WPE_RENDERER=OFF"
|
"-DUSE_WPE_RENDERER=OFF"
|
||||||
] ++ optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
|
"-DENABLE_GAMEPAD=OFF"
|
||||||
"-DENABLE_GTKDOC=OFF"
|
"-DENABLE_GTKDOC=OFF"
|
||||||
"-DENABLE_MINIBROWSER=OFF"
|
"-DENABLE_MINIBROWSER=OFF"
|
||||||
"-DENABLE_OPENGL=OFF"
|
|
||||||
"-DENABLE_QUARTZ_TARGET=ON"
|
"-DENABLE_QUARTZ_TARGET=ON"
|
||||||
"-DENABLE_VIDEO=ON"
|
"-DENABLE_VIDEO=ON"
|
||||||
"-DENABLE_WEBGL=OFF"
|
"-DENABLE_WEBGL=OFF"
|
||||||
"-DENABLE_WEB_AUDIO=OFF"
|
"-DENABLE_WEB_AUDIO=OFF"
|
||||||
"-DENABLE_X11_TARGET=OFF"
|
"-DENABLE_X11_TARGET=OFF"
|
||||||
"-DUSE_ACCELERATE=0"
|
"-DUSE_APPLE_ICU=OFF"
|
||||||
|
"-DUSE_OPENGL_OR_ES=OFF"
|
||||||
"-DUSE_SYSTEM_MALLOC=ON"
|
"-DUSE_SYSTEM_MALLOC=ON"
|
||||||
] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
|
] ++ lib.optionals (!stdenv.isLinux) [
|
||||||
|
"-DUSE_SYSTEMD=OFF"
|
||||||
|
] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
patchShebangs .
|
patchShebangs .
|
||||||
|
'' + lib.optionalString stdenv.isDarwin ''
|
||||||
|
# It needs malloc_good_size.
|
||||||
|
sed 22i'#include <malloc/malloc.h>' -i Source/WTF/wtf/FastMalloc.h
|
||||||
|
# <CommonCrypto/CommonRandom.h> needs CCCryptorStatus.
|
||||||
|
sed 43i'#include <CommonCrypto/CommonCryptor.h>' -i Source/WTF/wtf/RandomDevice.cpp
|
||||||
'';
|
'';
|
||||||
|
|
||||||
requiredSystemFeatures = [ "big-parallel" ];
|
requiredSystemFeatures = [ "big-parallel" ];
|
||||||
|
|
||||||
meta = {
|
meta = with lib; {
|
||||||
description = "Web content rendering engine, GTK port";
|
description = "Web content rendering engine, GTK port";
|
||||||
homepage = "https://webkitgtk.org/";
|
homepage = "https://webkitgtk.org/";
|
||||||
license = licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
|
|
Loading…
Reference in New Issue