public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kmymoney: cleanup install check

Browse Source 
A few things changed:

- no need for stdenv.hostPlatform == stdenv.buildPlatform conditional - this is already done in make-derivation
- put xvfb_run in installCheckInputs
This commit is contained in:
Matthew Bauer 2018-11-24 13:46:54 -06:00 committed by GitHub
parent 0c1197a7fb
commit 11e2f31532
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/office/kmymoney/default.nix
View File

@ -60,12 +60,11 @@ stdenv.mkDerivation rec {
"$out/share/kmymoney/weboob/kmymoneyweboob.py" "$out/share/kmymoney/weboob/kmymoneyweboob.py"
''; '';
doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; doInstallCheck = true;
installCheckPhase = let installCheckInputs = [ xvfb_run ];
pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}"; installCheckPhase = ''
in lib.optionalString doInstallCheck '' QT_PLUGIN_PATH=${lib.escapeShellArg "${qtbase.bin}/${qtbase.qtPluginPrefix}"} \
QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \ xvfb-run -s '-screen 0 1024x768x24' make test \
${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \
ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now. ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
''; '';