From d64d4bb38728661f5266043092183fd177e9abf1 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 16 May 2023 23:07:41 +0800 Subject: wpsoffice: set autoPatchelfIgnoreMissingDeps rather than remove libraries --- pkgs/applications/office/wpsoffice/default.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'pkgs/applications/office') diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 14affb306d431..1c2923c0d3295 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -36,17 +36,6 @@ stdenv.mkDerivation rec { unpackCmd = "dpkg -x $src ."; sourceRoot = "."; - postUnpack = '' - # distribution is missing libkappessframework.so, so we should not let - # autoPatchelfHook fail on the following dead libraries - rm -r opt/kingsoft/wps-office/office6/addons/pdfbatchcompression - - # Remove the following libraries because they depend on qt4 - rm -r opt/kingsoft/wps-office/office6/{librpcetapi.so,librpcwpsapi.so,librpcwppapi.so,libavdevice.so.58.10.100,libmediacoder.so} - rm -r opt/kingsoft/wps-office/office6/addons/wppcapturer/libwppcapturer.so - rm -r opt/kingsoft/wps-office/office6/addons/wppencoder/libwppencoder.so - ''; - nativeBuildInputs = [ dpkg autoPatchelfHook @@ -69,6 +58,7 @@ stdenv.mkDerivation rec { xorg.libXtst xorg.libXrandr xorg.libXcomposite + xorg.libXv cups pango ]; @@ -80,6 +70,15 @@ stdenv.mkDerivation rec { pango ]; + autoPatchelfIgnoreMissingDeps = [ + # distribution is missing libkappessframework.so + "libkappessframework.so" + # qt4 support is deprecated + "libQtCore.so.4" + "libQtNetwork.so.4" + "libQtXml.so.4" + ]; + installPhase = '' runHook preInstall prefix=$out/opt/kingsoft/wps-office @@ -99,7 +98,7 @@ stdenv.mkDerivation rec { preFixup = '' # The following libraries need libtiff.so.5, but nixpkgs provides libtiff.so.6 - patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so} + patchelf --replace-needed libtiff.so.5 libtiff.so $out/opt/kingsoft/wps-office/office6/{libpdfmain.so,libqpdfpaint.so,qt/plugins/imageformats/libqtiff.so,addons/pdfbatchcompression/libpdfbatchcompressionapp.so} # dlopen dependency patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so ''; -- cgit 1.4.1