anki: update sqlalchemy build input and clean up the expression

SQLAlchemy-0.9.9 was broken recently, probably because of an sqlite
update. So we just use the latest version.

The build expression used to take the entire package set as an argument,
which is poor style because it hides the true dependencies from the
interface. I've change the code to expect the appropriate individual
packages instead.

1 files changed, 7 insertions, 6 deletions

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 4c06f9126a963..f4fff289fec86 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -1,11 +1,12 @@
 { stdenv, lib, fetchurl, substituteAll, lame, mplayer
-, libpulseaudio, python, pyqt4, qt4, pythonPackages
+, libpulseaudio, python, pyqt4, qt4, wrapPython
+, pysqlite, sqlalchemy, pyaudio, beautifulsoup, httplib2, matplotlib
 # 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 }:
+, plotsSupport ? true
+}:
 
 let
-    py = pythonPackages;
     version = "2.0.33";
 in
 stdenv.mkDerivation rec {
@@ -18,10 +19,10 @@ stdenv.mkDerivation rec {
       sha256 = "1d5rf5gcw98m38wam6wh3hyh7qd78ws7zipm67xg744flqsjrzmr";
     };
 
-    pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy9 py.pyaudio py.beautifulsoup py.httplib2 ]
-              ++ lib.optional plotsSupport py.matplotlib;
+    pythonPath = [ pyqt4 pysqlite sqlalchemy pyaudio beautifulsoup httplib2 ]
+              ++ lib.optional plotsSupport matplotlib;
 
-    buildInputs = [ python py.wrapPython lame mplayer libpulseaudio ];
+    buildInputs = [ python wrapPython lame mplayer libpulseaudio ];
 
     phases = [ "unpackPhase" "patchPhase" "installPhase" ];