diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-10-10 07:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-10-10 07:19:05 +0200 |
| commit | 5ccacf4d6870c055fc14d7af20210c6a26dc7f98 (patch) | |
| tree | a07370dc41996a9e07ede79754c7fbafff933808 | |
| parent | Merge staging-next-23.05 into staging-23.05 (diff) | |
| parent | webkitgtk: 2.40.5 → 2.42.1 (diff) | |
| download | nixpkgs-5ccacf4d6870c055fc14d7af20210c6a26dc7f98.tar.gz | |
Merge #259474: webkitgtk: 2.40.5 → 2.42.1
...into staging-23.05
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/fdo-backend-path.patch | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 57168b2cc17a..1db2f4ce6d8c 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -27,6 +27,7 @@ , libxkbcommon , libavif , libepoxy +, libjxl , at-spi2-core , libxml2 , libsoup @@ -34,7 +35,6 @@ , libxslt , harfbuzz , libpthreadstubs -, pcre , nettle , libtasn1 , p11-kit @@ -51,7 +51,6 @@ , openjpeg , geoclue2 , sqlite -, enableGLES ? true , gst-plugins-base , gst-plugins-bad , woff2 @@ -71,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.40.5"; + version = "2.42.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -82,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38="; + hash = "sha256-b0H6yZidPuUcCMSN4dQ5ze3ey8dX40thgJh9mbFtJJk="; }; patches = lib.optionals stdenv.isLinux [ @@ -132,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { enchant2 libavif libepoxy + libjxl gnutls gst-plugins-bad gst-plugins-base @@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: { nettle openjpeg p11-kit - pcre sqlite woff2 ] ++ (with xorg; [ @@ -219,8 +218,6 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_GTK4=ON" ] ++ lib.optionals (!systemdSupport) [ "-DENABLE_JOURNALD_LOG=OFF" - ] ++ lib.optionals (stdenv.isLinux && enableGLES) [ - "-DENABLE_GLES2=ON" ]; postPatch = '' diff --git a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch index f46c0fe8a15c..48e7d9cca745 100644 --- a/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch +++ b/pkgs/development/libraries/webkitgtk/fdo-backend-path.patch @@ -3,7 +3,7 @@ @@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process #if PLATFORM(WAYLAND) - if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { + if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland && parameters.dmaBufRendererBufferMode.isEmpty()) { - wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); + wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); if (AcceleratedBackingStoreWayland::checkRequirements()) { |