Skip to content

Commit

Permalink
libtorrentRasterbar: multi outputs, install python2/3 bindings
Browse files Browse the repository at this point in the history
Signed-off-by: Austin Seipp <aseipp@pobox.com>
  • Loading branch information
thoughtpolice committed Aug 6, 2018
1 parent 937e402 commit d8e62d2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 4 deletions.
18 changes: 14 additions & 4 deletions pkgs/development/libraries/libtorrent-rasterbar/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib
, boost, openssl, libtool, python, libiconv, geoip }:
{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf
, zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses
}:

let
version = "1.1.9";
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 {
name = "libtorrent-rasterbar-${version}";
Expand All @@ -19,9 +22,16 @@ in stdenv.mkDerivation {

enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv geoip ];
buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ];
preConfigure = "./autotool.sh";

postInstall = ''
moveToOutput "include" "$dev"
moveToOutput "lib/${python.libPrefix}" "$python"
'';

outputs = [ "out" "dev" "python" ];

configureFlags = [
"--enable-python-binding"
"--with-libgeoip=system"
Expand Down
4 changes: 4 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17568,6 +17568,10 @@ EOF
foundationdb60 = (toPythonModule (pkgs.fdbPackages.override {
inherit python;
}).foundationdb60).python;

libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override {
inherit python;
})).python;
});

in fix' (extends overrides packages)

0 comments on commit d8e62d2

Please sign in to comment.