diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index cb20bb516c9b..17d80f2e298a 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -1,13 +1,15 @@ { stdenv, lib, fetchurl, substituteAll, lame, mplayer -, libpulseaudio, python, pyqt4, qt4, wrapPython -, pysqlite, sqlalchemy, pyaudio, beautifulsoup, httplib2, matplotlib +, libpulseaudio # This little flag adds a huge number of dependencies, but we assume that # everyone wants Anki to draw plots with statistics by default. , plotsSupport ? true +, python2Packages }: let version = "2.0.36"; + inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; + qt4 = pyqt4.qt; in stdenv.mkDerivation rec { name = "anki-${version}"; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "070p0jmx6cy7kp9bfcgpgkzpyqkcj81wy8gmacns03n5rlq8487v"; }; - pythonPath = [ pyqt4 pysqlite sqlalchemy pyaudio beautifulsoup httplib2 ] + pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] ++ lib.optional plotsSupport matplotlib; buildInputs = [ python wrapPython lame mplayer libpulseaudio ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ea4cde6936f..31983d3695ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15281,9 +15281,7 @@ in angband = callPackage ../games/angband { }; - anki = callPackage ../games/anki { - inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4; - }; + anki = callPackage ../games/anki { }; armagetronad = callPackage ../games/armagetronad { };