From 39028ee8a760bcd02d0c6a545cd63baf2a2dc41a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 18 Aug 2019 17:40:42 +0000
Subject: anki: simplify the expression, elide superfluous wappers

As suggested by @worldofpeace.
---
 pkgs/games/anki/default.nix | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'pkgs/games/anki')

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;
     };
-- 
cgit 1.4.1