wpsoffice: don't need wrapGAppsHook nor wrapQtAppsHook (ae773733) · Commits · nix / nixpkgs

pkgs/applications/office/wpsoffice/default.nix

+25 −19

Original line number	Diff line number	Diff line
		@@ -2,19 +2,22 @@
		, stdenv
		, fetchurl
		, dpkg
		, wrapGAppsHook
		, wrapQtAppsHook
		, autoPatchelfHook
		, alsa-lib
		, at-spi2-core
		, libtool
		, libxkbcommon
		, nspr
		, mesa
		, libtiff
		, cups
		, libxslt
		, udev
		, gtk3
		, gdk-pixbuf
		, qtbase
		, xorg
		, cups
		, pango
		, makeWrapper
		, useChineseVersion ? false
		}:

		@@ -44,19 +47,34 @@ stdenv.mkDerivation rec {
		rm -r opt/kingsoft/wps-office/office6/addons/wppencoder/libwppencoder.so
		'';

		nativeBuildInputs = [ dpkg wrapGAppsHook wrapQtAppsHook makeWrapper autoPatchelfHook ];
		nativeBuildInputs = [
		dpkg
		autoPatchelfHook
		];

		buildInputs = [
		alsa-lib
		xorg.libXdamage
		xorg.libXtst
		at-spi2-core
		libtool
		libxkbcommon
		nspr
		mesa
		libtiff
		libxslt
		udev
		gtk3
		gdk-pixbuf
		qtbase
		xorg.libXdamage
		xorg.libXtst
		xorg.libXrandr
		xorg.libXcomposite
		cups
		pango
		];

		dontWrapQtApps = true;

		runtimeDependencies = map lib.getLib [
		cups
		pango
		@@ -79,9 +97,6 @@ stdenv.mkDerivation rec {
		runHook postInstall
		'';

		dontWrapQtApps = true;
		dontWrapGApps = true;

		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}
		@@ -89,15 +104,6 @@ stdenv.mkDerivation rec {
		patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so
		'';

		postFixup = ''
		for f in "$out"/bin/*; do
		echo "Wrapping $f"
		wrapProgram "$f" \
		"''${gappsWrapperArgs[@]}" \
		"''${qtWrapperArgs[@]}"
		done
		'';

		meta = with lib; {
		description = "Office suite, formerly Kingsoft Office";
		homepage = "https://www.wps.com";