summary refs log tree commit diff
path: root/pkgs/applications/office/kmymoney
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-24 13:46:54 -0600
committerGitHub <noreply@github.com>2018-11-24 13:46:54 -0600
commit11e2f31532e754256b1a6fa021364a7329d8635c (patch)
treef4bf6a99438156615f3fc6fa5d5f8dcec58a531f /pkgs/applications/office/kmymoney
parent0c1197a7fb194dd91ac27f7c052a40df9248749d (diff)
downloadnixpkgs-11e2f31532e754256b1a6fa021364a7329d8635c.tar
nixpkgs-11e2f31532e754256b1a6fa021364a7329d8635c.tar.gz
nixpkgs-11e2f31532e754256b1a6fa021364a7329d8635c.tar.bz2
nixpkgs-11e2f31532e754256b1a6fa021364a7329d8635c.tar.lz
nixpkgs-11e2f31532e754256b1a6fa021364a7329d8635c.tar.xz
nixpkgs-11e2f31532e754256b1a6fa021364a7329d8635c.tar.zst
nixpkgs-11e2f31532e754256b1a6fa021364a7329d8635c.zip
kmymoney: cleanup install check
A few things changed:

- no need for stdenv.hostPlatform == stdenv.buildPlatform conditional - this is already done in make-derivation
- put xvfb_run in installCheckInputs
Diffstat (limited to 'pkgs/applications/office/kmymoney')
-rw-r--r--pkgs/applications/office/kmymoney/default.nix11
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 7899bf607e5..19bf8a8a740 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -60,12 +60,11 @@ stdenv.mkDerivation rec {
       "$out/share/kmymoney/weboob/kmymoneyweboob.py"
   '';
 
-  doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
-  installCheckPhase = let
-    pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}";
-  in lib.optionalString doInstallCheck ''
-    QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \
-      ${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \
+  doInstallCheck = true;
+  installCheckInputs = [ xvfb_run ];
+  installCheckPhase = ''
+    QT_PLUGIN_PATH=${lib.escapeShellArg "${qtbase.bin}/${qtbase.qtPluginPrefix}"} \
+      xvfb-run -s '-screen 0 1024x768x24' make test \
       ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
   '';