Author: eelco
Date: Wed May 4 08:55:30 2011
New Revision: 27128
URL: https://svn.nixos.org/websvn/nix/?rev=27128&sc=1
Log:
Modified:
nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix Wed May
4 08:41:50 2011 (r27127)
+++ nixpkgs/trunk/pkgs/applications/networking/p2p/tribler/default.nix Wed May
4 08:55:30 2011 (r27128)
@@ -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 @@
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
];
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed May 4 08:41:50
2011 (r27127)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed May 4 08:55:30
2011 (r27128)
@@ -6905,9 +6905,7 @@
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
