Merge pull request #299417 from jtojnar/wkgtk-244 (79e32e6f) · Commits · nix / nixpkgs

pkgs/development/libraries/webkitgtk/default.nix

+8 −24

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@
		, wayland
		, wayland-protocols
		, libwebp
		, libwpe
		, libwpe-fdo
		, enchant2
		, xorg
		, libxkbcommon
		@@ -48,7 +46,6 @@
		, libintl
		, lcms2
		, libmanette
		, openjpeg
		, geoclue2
		, sqlite
		, gst-plugins-base
		@@ -56,6 +53,7 @@
		, woff2
		, bubblewrap
		, libseccomp
		, libbacktrace
		, systemd
		, xdg-dbus-proxy
		, substituteAll
		@@ -70,7 +68,7 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "webkitgtk";
		version = "2.42.5";
		version = "2.44.0";
		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" ];
		@@ -81,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {

		src = fetchurl {
		url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
		hash = "sha256-tkJ4wfILjP2/tf9XPDfYcaunSh2ybZs5906JU/5h50k=";
		hash = "sha256-xmUw5Bulmx7bpO6J7yCyGI4nO+0El+lQhHKePPvjDIc=";
		};

		patches = lib.optionals stdenv.isLinux [
		@@ -90,13 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
		inherit (builtins) storeDir;
		inherit (addOpenGLRunpath) driverLink;
		})

		# Hardcode path to WPE backend
		# https://github.com/NixOS/nixpkgs/issues/110468
		(substituteAll {
		src = ./fdo-backend-path.patch;
		wpebackend_fdo = libwpe-fdo;
		})
		];

		preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
		@@ -150,17 +141,12 @@ stdenv.mkDerivation (finalAttrs: {
		libxkbcommon
		libxml2
		libxslt
		libbacktrace
		nettle
		openjpeg
		p11-kit
		sqlite
		woff2
		] ++ (with xorg; [
		libXdamage
		libXdmcp
		libXt
		libXtst
		]) ++ lib.optionals stdenv.isDarwin [
		] ++ lib.optionals stdenv.isDarwin [
		libedit
		readline
		] ++ lib.optional (stdenv.isDarwin && !stdenv.isAarch64) (
		@@ -175,8 +161,7 @@ stdenv.mkDerivation (finalAttrs: {
		libseccomp
		libmanette
		wayland
		libwpe
		libwpe-fdo
		xorg.libX11
		] ++ lib.optionals systemdSupport [
		systemd
		] ++ lib.optionals enableGeoLocation [
		@@ -184,7 +169,6 @@ stdenv.mkDerivation (finalAttrs: {
		] ++ lib.optionals withLibsecret [
		libsecret
		] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
		xorg.libXcomposite
		wayland-protocols
		];

		@@ -214,8 +198,8 @@ stdenv.mkDerivation (finalAttrs: {
		"-DENABLE_X11_TARGET=OFF"
		"-DUSE_APPLE_ICU=OFF"
		"-DUSE_OPENGL_OR_ES=OFF"
		] ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
		"-DUSE_GTK4=ON"
		] ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [
		"-DUSE_GTK4=OFF"
		] ++ lib.optionals (!systemdSupport) [
		"-DENABLE_JOURNALD_LOG=OFF"
		];

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

deleted100644 → 0

+0 −11

Original line number	Diff line number	Diff line
		--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
		+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
		@@ -84,7 +84,7 @@ void WebProcessPool::platformInitializeWebProcess(const WebProcessProxy& process

		#if PLATFORM(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()) {
		parameters.hostClientFileDescriptor = UnixFileDescriptor { wpe_renderer_host_create_client(), UnixFileDescriptor::Adopt };
		parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(String::fromLatin1(wpe_loader_get_loaded_implementation_library_name()));

Admin message