diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index f19e9d274313..39860414791c 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -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" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c9f0f6ba995a..13cf481a16f4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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)