From c5b27785cb7cb1f9849a43275e70170f195f8097 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Wed, 3 May 2023 11:40:15 +0800 Subject: [PATCH 1/2] wpsoffice: no steam-run --- pkgs/applications/office/wpsoffice/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index f90dc8fdcaf2..823c4c55114f 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, mkDerivation , fetchurl , dpkg , wrapGAppsHook @@ -13,7 +12,6 @@ , libtiff , cups , xorg -, steam-run , makeWrapper , useChineseVersion ? false }: @@ -54,9 +52,10 @@ stdenv.mkDerivation rec { nspr mesa libtiff - cups.lib ]; + runtimeDependencies = [ cups.lib ]; + installPhase = '' runHook preInstall prefix=$out/opt/kingsoft/wps-office @@ -71,12 +70,6 @@ stdenv.mkDerivation rec { substituteInPlace $i \ --replace /usr/bin $out/bin done - for i in wps wpp et wpspdf; do - mv $out/bin/$i $out/bin/.$i-orig - makeWrapper ${steam-run}/bin/steam-run $out/bin/$i \ - --add-flags $out/bin/.$i-orig \ - --argv0 $i - done runHook postInstall ''; From ef8d71482ed09b4868fd7482feacdc355033910f Mon Sep 17 00:00:00 2001 From: SharzyL Date: Wed, 3 May 2023 13:49:38 +0800 Subject: [PATCH 2/2] wpsoffice: let libelf.so depends on libudev.so --- pkgs/applications/office/wpsoffice/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 823c4c55114f..0e0a622de4a9 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -11,6 +11,7 @@ , mesa , libtiff , cups +, udev , xorg , makeWrapper , useChineseVersion ? false @@ -52,9 +53,12 @@ stdenv.mkDerivation rec { nspr mesa libtiff + udev ]; - runtimeDependencies = [ cups.lib ]; + runtimeDependencies = [ + cups.lib + ]; installPhase = '' runHook preInstall @@ -79,6 +83,8 @@ 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} + # dlopen dependency + patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so ''; postFixup = ''