b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #259383 from bobby285271/upd/webkitgtk

Browse source
This commit is contained in:
maxine 2023-10-07 01:01:06 +02:00 committed by GitHub
parent 5fa3ea862b 21c06e3507
commit 4d675aec00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/libraries/webkitgtk/default.nix
View file

@ -27,6 +27,7 @@
, libxkbcommon , libxkbcommon
, libavif , libavif
, libepoxy , libepoxy
, libjxl
, at-spi2-core , at-spi2-core
, libxml2 , libxml2
, libsoup , libsoup
@ -34,7 +35,6 @@
, libxslt , libxslt
, harfbuzz , harfbuzz
, libpthreadstubs , libpthreadstubs
, pcre
, nettle , nettle
, libtasn1 , libtasn1
, p11-kit , p11-kit
@ -51,7 +51,6 @@
, openjpeg , openjpeg
, geoclue2 , geoclue2
, sqlite , sqlite
, enableGLES ? true
, gst-plugins-base , gst-plugins-base
, gst-plugins-bad , gst-plugins-bad
, woff2 , woff2
@ -71,7 +70,7 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk"; 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"}"}"; 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" ]; outputs = [ "out" "dev" "devdoc" ];
@ -82,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl { src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-feBRomNmhiHZGmGl6xw3cdGnzskABD1K/vBsMmwWA38="; hash = "sha256-b0H6yZidPuUcCMSN4dQ5ze3ey8dX40thgJh9mbFtJJk=";
}; };
patches = lib.optionals stdenv.isLinux [ patches = lib.optionals stdenv.isLinux [
@ -132,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
enchant2 enchant2
libavif libavif
libepoxy libepoxy
libjxl
gnutls gnutls
gst-plugins-bad gst-plugins-bad
gst-plugins-base gst-plugins-base
@ -153,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: {
nettle nettle
openjpeg openjpeg
p11-kit p11-kit
pcre
sqlite sqlite
woff2 woff2
] ++ (with xorg; [ ] ++ (with xorg; [
@ -219,8 +218,6 @@ stdenv.mkDerivation (finalAttrs: {
"-DUSE_GTK4=ON" "-DUSE_GTK4=ON"
] ++ lib.optionals (!systemdSupport) [ ] ++ lib.optionals (!systemdSupport) [
"-DENABLE_JOURNALD_LOG=OFF" "-DENABLE_JOURNALD_LOG=OFF"
] ++ lib.optionals (stdenv.isLinux && enableGLES) [
"-DENABLE_GLES2=ON"
]; ];
postPatch = '' postPatch = ''

2
pkgs/development/libraries/webkitgtk/fdo-backend-path.patch
View file

@ -3,7 +3,7 @@
@@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process @@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process
#if PLATFORM(WAYLAND) #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("libWPEBackend-fdo-1.0.so.1");
+ wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1"); + wpe_loader_init("@wpebackend_fdo@/lib/libWPEBackend-fdo-1.0.so.1");
if (AcceleratedBackingStoreWayland::checkRequirements()) { if (AcceleratedBackingStoreWayland::checkRequirements()) {