* Start adding wxPython 2.5. Doesn't work yet though, so disable it

for now. svn path=/nixpkgs/trunk/; revision=1489
2004-09-22 10:18:02 +00:00
parent f3193ba5bc
commit 04c0ea5234
4 changed files with 45 additions and 2 deletions
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -640,10 +640,15 @@ rec {
    inherit fetchurl stdenv perl expat;
  };

-  wxPython = (import ../development/python-modules/wxPython) {
+  wxPython = (import ../development/python-modules/wxPython-2.5) {
    inherit fetchurl stdenv pkgconfig wxGTK python;
  };

+  wxPython24 = (import ../development/python-modules/wxPython) {
+    inherit fetchurl stdenv pkgconfig python;
+    wxGTK = wxGTK24;
+  };
+
  readline = (import ../development/libraries/readline) {
    inherit fetchurl stdenv ncurses;
  };
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -17,7 +17,7 @@ let {
    wget
    par2cmdline
    cksfv
-    bittorrent
+#    bittorrent
    graphviz
    bash
    binutils