diff options
| author | Austin Seipp <aseipp@pobox.com> | 2018-08-06 16:33:38 -0500 |
|---|---|---|
| committer | Austin Seipp <aseipp@pobox.com> | 2018-08-06 16:33:38 -0500 |
| commit | 8397411b4011cc5cd78f629e91b7635898e466d5 (patch) | |
| tree | 171be5b93bf519128210e082b69ccaddda7e9eff /pkgs/development/libraries/libtorrent-rasterbar | |
| parent | d8e62d202dd92d5bd4562742e241b621bc0cab48 (diff) | |
| download | nixpkgs-8397411b4011cc5cd78f629e91b7635898e466d5.tar nixpkgs-8397411b4011cc5cd78f629e91b7635898e466d5.tar.gz nixpkgs-8397411b4011cc5cd78f629e91b7635898e466d5.tar.bz2 nixpkgs-8397411b4011cc5cd78f629e91b7635898e466d5.tar.lz nixpkgs-8397411b4011cc5cd78f629e91b7635898e466d5.tar.xz nixpkgs-8397411b4011cc5cd78f629e91b7635898e466d5.tar.zst nixpkgs-8397411b4011cc5cd78f629e91b7635898e466d5.zip | |
Revert "libtorrentRasterbar: multi outputs, install python2/3 bindings"
This reverts commit d8e62d202dd92d5bd4562742e241b621bc0cab48.
Diffstat (limited to 'pkgs/development/libraries/libtorrent-rasterbar')
| -rw-r--r-- | pkgs/development/libraries/libtorrent-rasterbar/default.nix | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index f19e9d27431..39860414791 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" |