From 7a62283c465e12dc25cd078ae73f3ea649f339a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 4 May 2011 08:55:30 +0000
Subject: [PATCH] svn path=/nixpkgs/trunk/; revision=27128

---
 pkgs/applications/networking/p2p/tribler/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                      | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index 56ddcaa856e2..d2a2f9837f1d 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pythonPackages, makeWrapper, wxPython, nettools }:
+{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
 
 stdenv.mkDerivation {
   name = "tribler-5.3.8";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
 
   pythonPath =
-    [ wxPython pythonPackages.ssl pythonPackages.curses pythonPackages.apsw
+    [ pythonPackages.wxPython pythonPackages.ssl pythonPackages.curses pythonPackages.apsw
       pythonPackages.setuptools pythonPackages.m2crypto pythonPackages.sqlite3
     ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 25fd8bb0f589..a678de7d7733 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6905,9 +6905,7 @@ let
 
   transmission = callPackage ../applications/networking/p2p/transmission { };
 
-  tribler = callPackage ../applications/networking/p2p/tribler {
-    wxPython = wxPython26;
-  };
+  tribler = callPackage ../applications/networking/p2p/tribler { };
 
   twinkle = callPackage ../applications/networking/twinkle {
     qt = qt3;