diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-04-22 18:26:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2005-04-22 18:26:04 +0000 |
| commit | 4e4ad61aeee8d4fa44525bd0ffac085663ab3552 (patch) | |
| tree | 571b1d20997146cf50c90d63173177cff05d92fc /pkgs/system/all-packages-generic.nix | |
| parent | 2ed47f7522c4bcdade3ac803b7e93218e7225ac4 (diff) | |
| download | nixpkgs-4e4ad61aeee8d4fa44525bd0ffac085663ab3552.tar nixpkgs-4e4ad61aeee8d4fa44525bd0ffac085663ab3552.tar.gz nixpkgs-4e4ad61aeee8d4fa44525bd0ffac085663ab3552.tar.bz2 nixpkgs-4e4ad61aeee8d4fa44525bd0ffac085663ab3552.tar.lz nixpkgs-4e4ad61aeee8d4fa44525bd0ffac085663ab3552.tar.xz nixpkgs-4e4ad61aeee8d4fa44525bd0ffac085663ab3552.tar.zst nixpkgs-4e4ad61aeee8d4fa44525bd0ffac085663ab3552.zip | |
* Added pygtk.
* Updated bittorrent to 4.0.1. svn path=/nixpkgs/trunk/; revision=2879
Diffstat (limited to 'pkgs/system/all-packages-generic.nix')
| -rw-r--r-- | pkgs/system/all-packages-generic.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index f7b406d1acb..907c3eb6771 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -30,6 +30,8 @@ rec { substituter = ../build-support/substitute/substitute.sh; + makeWrapper = ../build-support/make-wrapper/make-wrapper.sh; + ### TOOLS @@ -133,8 +135,7 @@ rec { }; bittorrent = (import ../tools/networking/bittorrent) { - inherit fetchurl stdenv; - wxPython = wxPython24; + inherit fetchurl stdenv python pygtk makeWrapper; }; graphviz = (import ../tools/graphics/graphviz) { @@ -917,6 +918,11 @@ rec { wxGTK = wxGTK24; }; + pygtk = (import ../development/python-modules/pygtk) { + inherit fetchurl stdenv python pkgconfig; + inherit (gtkLibs) glib gtk; + }; + readline = (import ../development/libraries/readline) { inherit fetchurl stdenv ncurses; }; |