From e1ff1b26045d74eed1f4097f5dcec27fbe1d8042 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 23 Sep 2019 05:40:11 +0200 Subject: pkgs/psi: Fix Qt5 application wrapping Qt applications are no longer implicitly wrapped since a while[1] and so we new have to use wrapQtAppsHook instead, which also makes the wrapping for Psi obsolete. To make sure we don't run into startup errors again, I added a small VM test, which checks whether the application starts up properly. [1]: https://github.com/NixOS/nixpkgs/commit/f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e Signed-off-by: aszlig --- pkgs/aszlig/psi/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'pkgs/aszlig') diff --git a/pkgs/aszlig/psi/default.nix b/pkgs/aszlig/psi/default.nix index 94e1ba1c..d0e24c05 100644 --- a/pkgs/aszlig/psi/default.nix +++ b/pkgs/aszlig/psi/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake makeWrapper qt5.wrapQtAppsHook ]; buildInputs = [ hunspell libgcrypt @@ -69,12 +69,4 @@ in stdenv.mkDerivation rec { qt5.qtwebengine qt5.qtx11extras ]; - - postInstall = let - inherit (qt5.qtbase) qtPluginPrefix; - qtPlugins = "${qt5.qtbase}/${qtPluginPrefix}"; - in '' - wrapProgram "$out/bin/psi" \ - --suffix QT_PLUGIN_PATH : ${lib.escapeShellArg qtPlugins} - ''; } -- cgit 1.4.1