mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
* BitTorrent 5.0.3.
* wxPython 2.6.3. svn path=/nixpkgs/trunk/; revision=7341
This commit is contained in:
parent
0a91ca3091
commit
9ea7038c51
8 changed files with 51 additions and 17 deletions
|
@ -26,5 +26,8 @@ stdenv.mkDerivation {
|
|||
(if unicode then "--enable-unicode" else "")
|
||||
];
|
||||
|
||||
postBuild = "(cd contrib/src && make)";
|
||||
postInstall = "(cd contrib/src && make install)";
|
||||
|
||||
inherit gtk compat22;
|
||||
}
|
||||
|
|
12
pkgs/development/python-modules/pycrypto/default.nix
Normal file
12
pkgs/development/python-modules/pycrypto/default.nix
Normal file
|
@ -0,0 +1,12 @@
|
|||
{stdenv, fetchurl, python}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "pycrypto-2.0.1";
|
||||
src = fetchurl {
|
||||
url = http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz;
|
||||
md5 = "4d5674f3898a573691ffb335e8d749cd";
|
||||
};
|
||||
buildInputs = [python];
|
||||
buildPhase = "true";
|
||||
installPhase = "python ./setup.py install --prefix=$out";
|
||||
}
|
|
@ -6,7 +6,8 @@ stdenv.mkDerivation {
|
|||
url = http://tmrc.mit.edu/mirror/twisted/Twisted/2.4/Twisted-2.4.0.tar.bz2;
|
||||
md5 = "42eb0c8fd0f8707a39fff1dd6adab27d";
|
||||
};
|
||||
buildInputs = [python ZopeInterface];
|
||||
buildInputs = [python];
|
||||
propagatedBuildInputs = [ZopeInterface];
|
||||
buildPhase = "true";
|
||||
installPhase = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out";
|
||||
installCommand = "PYTHONPATH=$(toPythonPath $out):$PYTHONPATH; python ./setup.py install --prefix=$out";
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
source $stdenv/setup
|
||||
|
||||
flags="WXPORT=gtk2 BUILD_GLCANVAS=0 BUILD_OGL=0"
|
||||
flags="WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=0 BUILD_OGL=0 UNICODE=1"
|
||||
|
||||
configurePhase() {
|
||||
cd wxPython
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
assert wxGTK.compat22;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "wxPython-2.4.2.4";
|
||||
name = "wxPython-2.6.3.3";
|
||||
builder = ./builder.sh;
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/tarballs/wxPythonSrc-2.4.2.4.tar.gz;
|
||||
md5 = "ea4eb68e10a0c2a9be643b35dcb78e41";
|
||||
url = http://prdownloads.sourceforge.net/wxpython/wxPython-src-2.6.3.3.tar.bz2;
|
||||
md5 = "66b9c5f8e20a9505c39dab1a1234daa9";
|
||||
};
|
||||
buildInputs = [pkgconfig wxGTK (wxGTK.gtk) python];
|
||||
inherit wxGTK; # !!! move this down
|
||||
} // { inherit python; }
|
||||
}
|
||||
|
|
|
@ -1,10 +1,13 @@
|
|||
source $stdenv/setup
|
||||
source $makeWrapper
|
||||
|
||||
buildPhase=buildPhase
|
||||
buildPhase() {
|
||||
python setup.py build
|
||||
}
|
||||
# Workaround for:
|
||||
# File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join
|
||||
# elif path == '' or path.endswith('/'):
|
||||
# AttributeError: 'NoneType' object has no attribute 'endswith'
|
||||
export HOME=$TMP
|
||||
|
||||
buildPhase="python setup.py build"
|
||||
|
||||
installPhase=installPhase
|
||||
installPhase() {
|
||||
|
@ -16,7 +19,7 @@ installPhase() {
|
|||
# so don't move them.
|
||||
mv $out/bin/$i $out/bin/.orig-$i
|
||||
makeWrapper $out/bin/.orig-$i $out/bin/$i \
|
||||
--set PYTHONPATH "$out/lib/python2.4/site-packages:$pygtk/lib/python2.4/site-packages/gtk-2.0"
|
||||
--set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
|
||||
done
|
||||
}
|
||||
|
||||
|
|
|
@ -1,14 +1,23 @@
|
|||
{stdenv, fetchurl, python, pygtk, makeWrapper}:
|
||||
{ gui ? false
|
||||
, stdenv, fetchurl, makeWrapper
|
||||
, python, wxPython ? null, pycrypto, twisted
|
||||
}:
|
||||
|
||||
assert gui -> wxPython != null;
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "bittorrent-5.0.3";
|
||||
builder = ./builder.sh;
|
||||
|
||||
src = fetchurl {
|
||||
url = http://download.bittorrent.com/dl/BitTorrent-5.0.3.tar.gz;
|
||||
md5 = "592363a33c35e9f66759a736dbf7e038";
|
||||
};
|
||||
buildInputs = [python pygtk];
|
||||
inherit python pygtk makeWrapper;
|
||||
|
||||
buildInputs = [python pycrypto twisted]
|
||||
++ (if gui then [wxPython] else []);
|
||||
|
||||
inherit makeWrapper;
|
||||
|
||||
meta = {
|
||||
description = "The original client for the BitTorrent peer-to-peer file sharing protocol";
|
||||
|
|
|
@ -237,7 +237,8 @@ rec {
|
|||
};
|
||||
|
||||
bittorrent = import ../tools/networking/p2p/bittorrent {
|
||||
inherit fetchurl stdenv python pygtk makeWrapper;
|
||||
inherit fetchurl stdenv makeWrapper python wxPython pycrypto twisted;
|
||||
gui = true;
|
||||
};
|
||||
|
||||
bsdiff = import ../tools/compression/bsdiff {
|
||||
|
@ -1956,6 +1957,10 @@ rec {
|
|||
### DEVELOPMENT / PYTHON MODULES
|
||||
|
||||
|
||||
pycrypto = import ../development/python-modules/pycrypto {
|
||||
inherit fetchurl stdenv python;
|
||||
};
|
||||
|
||||
pygtk = import ../development/python-modules/pygtk {
|
||||
inherit fetchurl stdenv python pkgconfig;
|
||||
inherit (gtkLibs) glib gtk;
|
||||
|
@ -1966,7 +1971,8 @@ rec {
|
|||
};
|
||||
|
||||
twisted = import ../development/python-modules/twisted {
|
||||
inherit fetchurl stdenv python ZopeInterface;
|
||||
inherit fetchurl python ZopeInterface;
|
||||
stdenv = stdenvNew;
|
||||
};
|
||||
|
||||
ZopeInterface = import ../development/python-modules/ZopeInterface {
|
||||
|
|
Loading…
Reference in a new issue