Merge pull request #66796 from oxij/pkgs/fix-anki
anki: use wrapQtAppsHook to fix execution
This commit is contained in:
commit
09cc90827a
|
@ -1,5 +1,6 @@
|
|||
{ lib, fetchurl, pythonPackages, pkgconfig
|
||||
, qmake, qtbase, qtsvg, qtwebengine
|
||||
, wrapQtAppsHook
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -77,9 +78,12 @@ in buildPythonPackage rec {
|
|||
|
||||
doCheck = true;
|
||||
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
passthru = {
|
||||
inherit wrapQtAppsHook;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for Qt5";
|
||||
homepage = http://www.riverbankcomputing.co.uk;
|
||||
|
|
|
@ -92,12 +92,9 @@ buildPythonApplication rec {
|
|||
|
||||
checkInputs = [ pytest glibcLocales nose ];
|
||||
|
||||
nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ];
|
||||
buildInputs = [ lame mplayer libpulseaudio ];
|
||||
|
||||
makeWrapperArgs = [
|
||||
''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"''
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Disable updated version check.
|
||||
./no-version-check.patch
|
||||
|
@ -157,17 +154,23 @@ buildPythonApplication rec {
|
|||
cp -rv locale $out/share/
|
||||
cp -rv anki aqt web $pp/
|
||||
|
||||
wrapPythonPrograms
|
||||
|
||||
# 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;
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://apps.ankiweb.net/";
|
||||
description = "Spaced repetition flashcard program";
|
||||
longDescription = ''
|
||||
|
@ -185,6 +188,6 @@ buildPythonApplication rec {
|
|||
license = licenses.agpl3Plus;
|
||||
broken = stdenv.hostPlatform.isAarch64;
|
||||
platforms = platforms.mesaPlatforms;
|
||||
maintainers = with maintainers; [ the-kenny Profpatsch enzime ];
|
||||
maintainers = with maintainers; [ oxij the-kenny Profpatsch enzime ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue