From 7f5f68d9ff29a3b2e97450171aab28e3ecc91373 Mon Sep 17 00:00:00 2001 From: Olli Helenius Date: Tue, 7 Oct 2025 22:19:48 +0300 Subject: [PATCH] jetbrains.jcef: build with Thrift 0.20.0 Upstream is incompatible with 0.21.0. --- .../compilers/jetbrains-jdk/jcef.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jetbrains-jdk/jcef.nix b/pkgs/development/compilers/jetbrains-jdk/jcef.nix index ed517361a166..376e4323c267 100644 --- a/pkgs/development/compilers/jetbrains-jdk/jcef.nix +++ b/pkgs/development/compilers/jetbrains-jdk/jcef.nix @@ -99,6 +99,21 @@ let .${platform}; inherit (arches) depsArch projectArch targetArch; + thrift20 = thrift.overrideAttrs (old: { + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "thrift"; + tag = "v0.20.0"; + hash = "sha256-cwFTcaNHq8/JJcQxWSelwAGOLvZHoMmjGV3HBumgcWo="; + }; + + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" + ]; + }); + in stdenv.mkDerivation rec { pname = "jcef-jetbrains"; @@ -125,7 +140,7 @@ stdenv.mkDerivation rec { libXdamage nss nspr - thrift + thrift20 ]; src = fetchFromGitHub { @@ -184,7 +199,7 @@ stdenv.mkDerivation rec { -e 's|vcpkg_install_package(boost-filesystem boost-interprocess thrift)||' \ -i CMakeLists.txt - sed -e 's|vcpkg_bring_host_thrift()|set(THRIFT_COMPILER_HOST ${thrift}/bin/thrift)|' -i remote/CMakeLists.txt + sed -e 's|vcpkg_bring_host_thrift()|set(THRIFT_COMPILER_HOST ${lib.getExe thrift20})|' -i remote/CMakeLists.txt mkdir jcef_build cd jcef_build