lol

libtorrentRasterbar: multi outputs, install python2/3 bindings

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

Signed-off-by: Austin Seipp <aseipp@pobox.com>

+20 -5
+2 -1
pkgs/applications/networking/p2p/deluge/default.nix
··· 18 18 ]; 19 19 20 20 propagatedBuildInputs = with pythonPackages; [ 21 - pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity 21 + pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity 22 + libtorrentRasterbar.dev libtorrentRasterbar.python 22 23 ]; 23 24 24 25 nativeBuildInputs = [ intltool ];
+14 -4
pkgs/development/libraries/libtorrent-rasterbar/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib 2 - , boost, openssl, libtool, python, libiconv, geoip }: 1 + { stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf 2 + , zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses 3 + }: 3 4 4 5 let 5 6 version = "1.1.9"; 6 7 formattedVersion = lib.replaceChars ["."] ["_"] version; 7 8 8 - boostPython = boost.override { enablePython = true; }; 9 + # Make sure we override python, so the correct version is chosen 10 + # for the bindings, if overridden 11 + boostPython = boost.override { enablePython = true; inherit python; }; 9 12 10 13 in stdenv.mkDerivation { 11 14 name = "libtorrent-rasterbar-${version}"; ··· 19 22 20 23 enableParallelBuilding = true; 21 24 nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; 22 - buildInputs = [ boostPython openssl zlib python libiconv geoip ]; 25 + buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; 23 26 preConfigure = "./autotool.sh"; 27 + 28 + postInstall = '' 29 + moveToOutput "include" "$dev" 30 + moveToOutput "lib/${python.libPrefix}" "$python" 31 + ''; 32 + 33 + outputs = [ "out" "dev" "python" ]; 24 34 25 35 configureFlags = [ 26 36 "--enable-python-binding"
+4
pkgs/top-level/python-packages.nix
··· 17490 17490 foundationdb60 = (toPythonModule (pkgs.fdbPackages.override { 17491 17491 inherit python; 17492 17492 }).foundationdb60).python; 17493 + 17494 + libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { 17495 + inherit python; 17496 + })).python; 17493 17497 }); 17494 17498 17495 17499 in fix' (extends overrides packages)