Unverified Commit 4d675aec authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #259383 from bobby285271/upd/webkitgtk

parents 5fa3ea86 21c06e35

pkgs/development/libraries/webkitgtk/default.nix

+4 −7
Original line number Diff line number Diff line
@@ -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 = ''

pkgs/development/libraries/webkitgtk/fdo-backend-path.patch

+1 −1
Original line number Diff line number Diff line
@@ -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()) {