ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 06:14:26 +03:00
Code Issues Projects Releases Wiki Activity

* Added pygtk.

Browse Source 
* Updated bittorrent to 4.0.1.

svn path=/nixpkgs/trunk/; revision=2879
This commit is contained in:
Eelco Dolstra 2005-04-22 18:26:04 +00:00
parent 2ed47f7522
commit 4e4ad61aee
4 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/python-modules/pygtk/default.nix Normal file
View File

@ -0,0 +1,11 @@
{stdenv, fetchurl, python, pkgconfig, glib, gtk}:
stdenv.mkDerivation {
name = "pygtk-2.6.1";
# builder = ./builder.sh;
src = fetchurl {
url = http://ftp.gnome.org/pub/GNOME/sources/pygtk/2.6/pygtk-2.6.1.tar.bz2;
md5 = "b4610829e4f57b5538dfa3b8f1fbe026";
};
buildInputs = [python pkgconfig glib gtk];
}

10
pkgs/system/all-packages-generic.nix
View File

@ -30,6 +30,8 @@ rec {
substituter = ../build-support/substitute/substitute.sh; substituter = ../build-support/substitute/substitute.sh;
makeWrapper = ../build-support/make-wrapper/make-wrapper.sh;
### TOOLS ### TOOLS
@ -133,8 +135,7 @@ rec {
}; };
bittorrent = (import ../tools/networking/bittorrent) { bittorrent = (import ../tools/networking/bittorrent) {
inherit fetchurl stdenv; inherit fetchurl stdenv python pygtk makeWrapper;
wxPython = wxPython24;
}; };
graphviz = (import ../tools/graphics/graphviz) { graphviz = (import ../tools/graphics/graphviz) {
@ -917,6 +918,11 @@ rec {
wxGTK = wxGTK24; wxGTK = wxGTK24;
}; };
pygtk = (import ../development/python-modules/pygtk) {
inherit fetchurl stdenv python pkgconfig;
inherit (gtkLibs) glib gtk;
};
readline = (import ../development/libraries/readline) { readline = (import ../development/libraries/readline) {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
}; };

16
pkgs/tools/networking/bittorrent/builder.sh
View File

@ -1,5 +1,5 @@
buildInputs="$python $wxPython"
. $stdenv/setup . $stdenv/setup
. $makeWrapper
buildPhase=buildPhase buildPhase=buildPhase
buildPhase() { buildPhase() {
@ -11,14 +11,12 @@ installPhase() {
python setup.py install --prefix=$out python setup.py install --prefix=$out
# Create wrappers that set the environment correctly. # Create wrappers that set the environment correctly.
mv $out/bin $out/bin-orig for i in $(cd $out/bin && ls); do
mkdir $out/bin # Note: the GUI apps except to be in a directory called `bin',
for i in $(cd $out/bin-orig && ls); do # so don't move them.
cat > $out/bin/$i <<EOF mv $out/bin/$i $out/bin/.orig-$i
#! /bin/sh makeWrapper $out/bin/.orig-$i $out/bin/$i \
PYTHONPATH=$out/lib/python2.3/site-packages:$wxPython/lib/python2.3/site-packages exec $out/bin-orig/$i "\$@" --set PYTHONPATH "$out/lib/python2.3/site-packages:$pygtk/lib/python2.3/site-packages/gtk-2.0"
EOF
chmod +x $out/bin/$i
done done
} }

14
pkgs/tools/networking/bittorrent/default.nix
View File

@ -1,14 +1,12 @@
{stdenv, fetchurl, wxPython}: {stdenv, fetchurl, python, pygtk, makeWrapper}:
assert wxPython.python.zlibSupport;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bittorrent-3.4.2"; name = "bittorrent-4.0.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/BitTorrent-3.4.2.tar.gz; url = http://www.bittorrent.com/dl/BitTorrent-4.0.1.tar.gz;
md5 = "b854f25a33289565bcaeaded04955c1a"; md5 = "e890d856d43b3d0af14b28714bc5801a";
}; };
inherit wxPython; buildInputs = [python pygtk];
inherit (wxPython) python; inherit python pygtk makeWrapper;
} }