mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 15:41:40 +00:00
Code Issues Wiki Activity

Revert "libtorrentRasterbar: multi outputs, install python2/3 bindings"

Browse source 
This reverts commit d8e62d202d.
This commit is contained in:
Austin Seipp 2018-08-06 16:33:38 -05:00
parent d8e62d202d
commit 8397411b40
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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