From 6daab9b9ff501aa16f66eb0601c83418436c00ad Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 14 Apr 2020 02:18:27 -0400 Subject: [PATCH] wpsoffice: apply Qt and GTK wrappers Based on the work of Ninlives. --- .../applications/office/wpsoffice/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 497897a9a02..76ecdcb8abb 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -3,6 +3,7 @@ , fetchurl , autoPatchelfHook , dpkg +, wrapGAppsHook , wrapQtAppsHook , alsaLib , atk @@ -52,7 +53,7 @@ stdenv.mkDerivation rec{ rm opt/kingsoft/wps-office/office6/{libjsetapi.so,libjswppapi.so,libjswpsapi.so} ''; - nativeBuildInputs = [ autoPatchelfHook dpkg wrapQtAppsHook ]; + nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook wrapQtAppsHook ]; meta = { description = "Office program originally named Kingsoft Office"; @@ -154,4 +155,20 @@ stdenv.mkDerivation rec{ --replace /opt/kingsoft/wps-office $prefix done ''; + + runtimeLibPath = stdenv.lib.makeLibraryPath [ + cups.lib + ]; + + dontWrapQtApps = true; + dontWrapGApps = true; + postFixup = '' + for f in "$out"/bin/*; do + echo "Wrapping $f" + wrapProgram "$f" \ + "''${gappsWrapperArgs[@]}" \ + "''${qtWrapperArgs[@]}" \ + --suffix LD_LIBRARY_PATH : "$runtimeLibPath" + done + ''; }