diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-08-18 17:40:42 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-08-18 17:44:25 +0000 |
| commit | 39028ee8a760bcd02d0c6a545cd63baf2a2dc41a (patch) | |
| tree | 5bda3b074f71c6de401b8267478b21b895c5a52d /pkgs/games/anki | |
| parent | 1a11eb34a1053127fbb5daba38e631dbae564055 (diff) | |
| download | nixpkgs-39028ee8a760bcd02d0c6a545cd63baf2a2dc41a.tar nixpkgs-39028ee8a760bcd02d0c6a545cd63baf2a2dc41a.tar.gz nixpkgs-39028ee8a760bcd02d0c6a545cd63baf2a2dc41a.tar.bz2 nixpkgs-39028ee8a760bcd02d0c6a545cd63baf2a2dc41a.tar.lz nixpkgs-39028ee8a760bcd02d0c6a545cd63baf2a2dc41a.tar.xz nixpkgs-39028ee8a760bcd02d0c6a545cd63baf2a2dc41a.tar.zst nixpkgs-39028ee8a760bcd02d0c6a545cd63baf2a2dc41a.zip | |
anki: simplify the expression, elide superfluous wappers
As suggested by @worldofpeace.
Diffstat (limited to 'pkgs/games/anki')
| -rw-r--r-- | pkgs/games/anki/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index a316708ad4e..b0efc54db36 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; }; |