Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mnemosyne: Fix Qt related segfault and OpenGL warning #84954

Merged
merged 4 commits into from
Apr 13, 2020
Merged

mnemosyne: Fix Qt related segfault and OpenGL warning #84954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6889aa
mnemosyne: Fix 'Could not find Qt' segfault
unode Apr 10, 2020
4ea3095
mnemosyne: Add pyopengl to silence OpenGL warning
unode Apr 10, 2020
f5814e2
mnemosyne: Install mnemosyne.desktop
unode Apr 11, 2020
af17bae
pythonPackages.cherrypy: disable failing test
unode Apr 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkgs/development/python-modules/cherrypy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ buildPythonPackage rec {
# Disable doctest plugin because times out
checkPhase = ''
substituteInPlace pytest.ini --replace "--doctest-modules" ""
pytest --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes ${stdenv.lib.optionalString stdenv.isDarwin "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
pytest \
--deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \
--deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \
${stdenv.lib.optionalString stdenv.isDarwin
"--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"}
'';

meta = with stdenv.lib; {
Expand Down
20 changes: 11 additions & 9 deletions pkgs/games/mnemosyne/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,19 @@ python.pkgs.buildPythonApplication rec {
sha256 = "0dhvg9cxc6m6kzk75h363h1g0bl80cqz11cijh0zpz9f4w6lnqsq";
};

nativeBuildInputs = with python.pkgs; [ wrapPython pyqtwebengine.wrapQtAppsHook ];
nativeBuildInputs = with python.pkgs; [ pyqtwebengine.wrapQtAppsHook ];

buildInputs = [ anki ];

propagatedBuildInputs = with python.pkgs; [
cheroot
cherrypy
googletrans
gtts
pyqtwebengine
pyqt5
matplotlib
cherrypy
cheroot
pyopengl
pyqt5
pyqtwebengine
webob
];

Expand All @@ -36,16 +37,17 @@ python.pkgs.buildPythonApplication rec {
doCheck = false;

postInstall = ''
mkdir -p $out/share
mkdir -p $out/share/applications
mv $out/${python.sitePackages}/$out/share/locale $out/share
mv mnemosyne.desktop $out/share/applications
rm -r $out/${python.sitePackages}/nix
'';

dontWrapQtApps = true;

preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
makeWrapperArgs = [
"\${qtWrapperArgs[@]}"
];

meta = {
homepage = "https://mnemosyne-proj.org/";
Expand Down