mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-29 10:23:29 +00:00
anki: simplify the expression, elide superfluous wappers
As suggested by @worldofpeace.
This commit is contained in:
parent
1a11eb34a1
commit
39028ee8a7
@ -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;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user