From f9f60a4608798c2bf37208562dbdcf2ddfa59e61 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Tue, 30 Jun 2026 16:53:01 +0200 Subject: [PATCH] onlyoffice-documentserver: use icu78 This is needed so that doctrenderer uses the same version of icu as the nodejs.libv8 . This is a little scary because it's a different version of icu than boost is built with, but seems to work out in practice. After #520553 this should ideally be in sync again. Fixes #536824 --- pkgs/by-name/on/onlyoffice-documentserver/x2t.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix index 26d1d20ea9db..09208f3e79a2 100644 --- a/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix +++ b/pkgs/by-name/on/onlyoffice-documentserver/x2t.nix @@ -12,7 +12,7 @@ optipng, x265, libde265, - icu, + icu78, jdk, lib, nodejs_22, @@ -30,6 +30,9 @@ }: let + # default at the time of writing is still 76, + # but libv8 from nodejs_22 needs 78 + icu = icu78; openssl' = openssl.override { enableMD2 = true; static = true; @@ -41,8 +44,11 @@ let $BUILDRT/Common/3dParty/icu/icu.pri \ --replace-fail "ICU_MAJOR_VER = 74" "ICU_MAJOR_VER = ${lib.versions.major icu.version}" - mkdir $BUILDRT/Common/3dParty/icu/linux_64 - ln -s ${icu}/lib $BUILDRT/Common/3dParty/icu/linux_64/build + mkdir -p $BUILDRT/Common/3dParty/icu/linux_64/build + ln -s ${icu.dev}/include $BUILDRT/Common/3dParty/icu/linux_64/build/include + for i in ${icu}/lib/* ; do + ln -s $i $BUILDRT/Common/3dParty/icu/linux_64/build/$(basename $i) + done ''; icuQmakeFlags = [ "QMAKE_LFLAGS+=-Wl,--no-undefined"