public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check bittornado with newer wxGTK, generic cleanup

Browse Source 
svn path=/nixpkgs/trunk/; revision=29433
This commit is contained in:
Michael Raskin 2011-09-22 06:31:35 +00:00
parent 514e07ba96
commit 234a58870a
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/networking/p2p/bit-tornado/default.nix
View File

@ -1,4 +1,5 @@
{stdenv,fetchurl,python,wxPython26}: {stdenv,fetchurl,python, wxPython, makeWrapper,
ssl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "bit-tornado"; name = "bit-tornado";
@ -7,14 +8,15 @@ stdenv.mkDerivation {
sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr"; sha256 = "1q6rapidnizy8wawasirgyjl9s4lrm7mm740mc5q5sdjyl5svrnr";
}; };
buildInputs = [python]; buildInputs = [python wxPython makeWrapper ssl];
buildPhase = " "; buildPhase = '' '';
installPhase = '' installPhase = ''
python setup.py install --prefix=$out ; python setup.py install --prefix=$out ;
echo 'export PYTHONPATH=$PYTHONPATH:'$out'/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages:${wxPython26}/lib/${python.libPrefix}/site-packages/wx-2.6-gtk2-unicode for i in $(cd $out/bin && ls); do
python `which btdownloadgui.py` --ipv6_enabled 1 --ipv6_binds_v4 0 "$@";' > $out/bin/bittornado ; wrapProgram $out/bin/$i \
chmod a+rx $out/bin/bittornado; --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
done
''; '';
meta = { meta = {

4
pkgs/top-level/all-packages.nix
View File

@ -446,7 +446,9 @@ let
gui = true; gui = true;
}; };
bittornado = callPackage ../tools/networking/p2p/bit-tornado { }; bittornado = callPackage ../tools/networking/p2p/bit-tornado {
inherit (pythonPackages) ssl;
};
blueman = callPackage ../tools/bluetooth/blueman { blueman = callPackage ../tools/bluetooth/blueman {
inherit (pythonPackages) notify; inherit (pythonPackages) notify;