summary refs log tree commit diff
path: root/pkgs/development/libraries/libtorrent-rasterbar
diff options
context:
space:
mode:
authorAustin Seipp <aseipp@pobox.com>2018-08-06 17:47:42 -0500
committerAustin Seipp <aseipp@pobox.com>2018-08-07 18:40:39 -0500
commitd3b51ab973a1e0d30b396c9ca875a68f67a1f44f (patch)
tree84277045d67dd26757e7c221a82ef3b619ce8b43 /pkgs/development/libraries/libtorrent-rasterbar
parentfbb60556f8d831b00966129cda31fba032cfc2df (diff)
downloadnixpkgs-d3b51ab973a1e0d30b396c9ca875a68f67a1f44f.tar
nixpkgs-d3b51ab973a1e0d30b396c9ca875a68f67a1f44f.tar.gz
nixpkgs-d3b51ab973a1e0d30b396c9ca875a68f67a1f44f.tar.bz2
nixpkgs-d3b51ab973a1e0d30b396c9ca875a68f67a1f44f.tar.lz
nixpkgs-d3b51ab973a1e0d30b396c9ca875a68f67a1f44f.tar.xz
nixpkgs-d3b51ab973a1e0d30b396c9ca875a68f67a1f44f.tar.zst
nixpkgs-d3b51ab973a1e0d30b396c9ca875a68f67a1f44f.zip
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>
Diffstat (limited to 'pkgs/development/libraries/libtorrent-rasterbar')
-rw-r--r--pkgs/development/libraries/libtorrent-rasterbar/default.nix18
1 files changed, 14 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 39860414791..f19e9d27431 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -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}";
@@ -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"