nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 00:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

anki: simplify the expression, elide superfluous wappers

Browse Source 
As suggested by @worldofpeace.
This commit is contained in:
Jan Malakhovski 2019-08-18 17:40:42 +00:00
parent 1a11eb34a1
commit 39028ee8a7
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/games/anki/default.nix
View File

@ -95,10 +95,6 @@ buildPythonApplication rec {
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
buildInputs = [ lame mplayer libpulseaudio ]; buildInputs = [ lame mplayer libpulseaudio ];
makeWrapperArgs = [
''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
];
patches = [ patches = [
# Disable updated version check. # Disable updated version check.
./no-version-check.patch ./no-version-check.patch
@ -132,8 +128,6 @@ buildPythonApplication rec {
env HOME=$TMP pytest --ignore tests/test_sync.py env HOME=$TMP pytest --ignore tests/test_sync.py
''; '';
dontWrapQtApps = true;
installPhase = '' installPhase = ''
pp=$out/lib/${python.libPrefix}/site-packages pp=$out/lib/${python.libPrefix}/site-packages
@ -160,15 +154,18 @@ buildPythonApplication rec {
cp -rv locale $out/share/ cp -rv locale $out/share/
cp -rv anki aqt web $pp/ cp -rv anki aqt web $pp/
wrapPythonPrograms
for program in $out/bin/*; do
wrapQtApp "$program"
done
# copy the manual into $doc # copy the manual into $doc
cp -r ${manual}/share/doc/anki/html $doc/share/doc/anki 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 = { passthru = {
inherit manual; inherit manual;
}; };