summaryrefslogtreecommitdiffstats
path: root/pkgs/games/anki
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-08-18 17:40:42 +0000
committerJan Malakhovski <oxij@oxij.org>2019-08-18 17:44:25 +0000
commit39028ee8a760bcd02d0c6a545cd63baf2a2dc41a (patch)
tree5bda3b074f71c6de401b8267478b21b895c5a52d /pkgs/games/anki
parent1a11eb34a1053127fbb5daba38e631dbae564055 (diff)
anki: simplify the expression, elide superfluous wappers
As suggested by @worldofpeace.
Diffstat (limited to 'pkgs/games/anki')
-rw-r--r--pkgs/games/anki/default.nix19
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index a316708ad4e0..b0efc54db363 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -95,10 +95,6 @@ buildPythonApplication rec {
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
buildInputs = [ lame mplayer libpulseaudio ];
- makeWrapperArgs = [
- ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
- ];
-
patches = [
# Disable updated version check.
./no-version-check.patch
@@ -132,8 +128,6 @@ buildPythonApplication rec {
env HOME=$TMP pytest --ignore tests/test_sync.py
'';
- dontWrapQtApps = true;
-
installPhase = ''
pp=$out/lib/${python.libPrefix}/site-packages
@@ -160,15 +154,18 @@ buildPythonApplication rec {
cp -rv locale $out/share/
cp -rv anki aqt web $pp/
- wrapPythonPrograms
- for program in $out/bin/*; do
- wrapQtApp "$program"
- done
-
# copy the manual into $doc
cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki
'';
+ dontWrapQtApps = true;
+ makeWrapperArgs = [
+ ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
+ "\${qtWrapperArgs[@]}"
+ ];
+
+ # now wrapPythonPrograms from postFixup will add both python and qt env variables
+
passthru = {
inherit manual;
};