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

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

Browse Source 
This reverts commit d8e62d202dd92d5bd4562742e241b621bc0cab48.
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 { stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, automake, autoconf, zlib
, zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses , boost, openssl, libtool, python, libiconv, geoip }:
}:
let let
version = "1.1.9"; version = "1.1.9";
formattedVersion = lib.replaceChars ["."] ["_"] version; formattedVersion = lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; };
# 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}";
@ -22,16 +19,9 @@ in stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; buildInputs = [ boostPython openssl zlib python libiconv geoip ];
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

@ -17568,10 +17568,6 @@ 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)