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

libtorrentRasterbar: multi outputs, install python2/3 bindings

Browse Source 
Also fixes the Deluge build, which relied on .out and .python
being the same.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2018-08-06 17:47:42 -05:00
parent fbb60556f8
commit d3b51ab973
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/p2p/deluge/default.nix
View File

@ -18,7 +18,8 @@ pythonPackages.buildPythonPackage rec {
]; ];
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity
libtorrentRasterbar.dev libtorrentRasterbar.python
]; ];
nativeBuildInputs = [ intltool ]; nativeBuildInputs = [ intltool ];

18
pkgs/development/libraries/libtorrent-rasterbar/default.nix
View File

@ -1,11 +1,14 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib { stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf
, boost, openssl, libtool, python, libiconv, geoip }: , zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses
}:
let let
version = "1.1.9"; version = "1.1.9";
formattedVersion = lib.replaceChars ["."] ["_"] version; formattedVersion = lib.replaceChars ["."] ["_"] version;
boostPython = boost.override { enablePython = true; }; # Make sure we override python, so the correct version is chosen
# for the bindings, if overridden
boostPython = boost.override { enablePython = true; inherit python; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "libtorrent-rasterbar-${version}"; name = "libtorrent-rasterbar-${version}";
@ -19,9 +22,16 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv geoip ]; buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ];
preConfigure = "./autotool.sh"; preConfigure = "./autotool.sh";
postInstall = ''
moveToOutput "include" "$dev"
moveToOutput "lib/${python.libPrefix}" "$python"
'';
outputs = [ "out" "dev" "python" ];
configureFlags = [ configureFlags = [
"--enable-python-binding" "--enable-python-binding"
"--with-libgeoip=system" "--with-libgeoip=system"

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

@ -17490,6 +17490,10 @@ EOF
foundationdb60 = (toPythonModule (pkgs.fdbPackages.override { foundationdb60 = (toPythonModule (pkgs.fdbPackages.override {
inherit python; inherit python;
}).foundationdb60).python; }).foundationdb60).python;
libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override {
inherit python;
})).python;
}); });
in fix' (extends overrides packages) in fix' (extends overrides packages)