aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/webkitgtk/default.nix')
-rw-r--r--nixpkgs/pkgs/development/libraries/webkitgtk/default.nix20
1 files changed, 14 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index c0fae2f7176..7d48b68d14c 100644
--- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -6,6 +6,7 @@
, enableGeoLocation ? true, geoclue2, sqlite
, enableGtk2Plugins ? false, gtk2 ? null
, gst-plugins-base, gst-plugins-bad, woff2
+, bubblewrap, libseccomp, xdg-dbus-proxy, substituteAll
}:
assert enableGeoLocation -> geoclue2 != null;
@@ -15,7 +16,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "webkitgtk";
- version = "2.24.4";
+ version = "2.26.1";
meta = {
description = "Web content rendering engine, GTK port";
@@ -28,11 +29,14 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
- sha256 = "1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46";
+ sha256 = "0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb";
};
- patches = optionals stdenv.isDarwin [
- ## TODO add necessary patches for Darwin
+ patches = optionals stdenv.isLinux [
+ (substituteAll {
+ src = ./fix-bubblewrap-paths.patch;
+ inherit (builtins) storeDir;
+ })
];
postPatch = ''
@@ -41,8 +45,9 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DPORT=GTK"
- "-DUSE_LIBHYPHEN=0"
+ "-DUSE_LIBHYPHEN=OFF"
"-DENABLE_INTROSPECTION=ON"
+ "-DUSE_WPE_RENDERER=OFF"
]
++ optional (!enableGtk2Plugins) "-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
@@ -73,11 +78,14 @@ stdenv.mkDerivation rec {
++ optional enableGtk2Plugins gtk2
++ (with xorg; [ libXdmcp libXt libXtst libXdamage ])
++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ]
- ++ optional stdenv.isLinux wayland;
+ ++ optionals stdenv.isLinux [
+ wayland bubblewrap libseccomp xdg-dbus-proxy
+ ];
propagatedBuildInputs = [
libsoup gtk3
];
outputs = [ "out" "dev" ];
+
}