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

libtorrent-rasterbar: Fix build on darwin but still fails with some python issue

Browse Source
This commit is contained in:
Sandro Jäckel 2020-12-08 02:54:58 +01:00
parent 5a500da7c2
commit b101b25cef
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf { stdenv, fetchFromGitHub, pkg-config, automake, autoconf
, zlib, boost, openssl, libtool, python, libiconv, ncurses , zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration
}: }:
let let
version = "1.2.6"; version = "1.2.6";
formattedVersion = lib.replaceChars ["."] ["_"] version; formattedVersion = stdenv.lib.replaceChars ["."] ["_"] version;
# Make sure we override python, so the correct version is chosen # Make sure we override python, so the correct version is chosen
# for the bindings, if overridden # for the bindings, if overridden
@ -22,8 +22,12 @@ in stdenv.mkDerivation {
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; nativeBuildInputs = [ automake autoconf libtool pkg-config ];
buildInputs = [ boostPython openssl zlib python libiconv ncurses ]
++ stdenv.lib.optionals stdenv.isDarwin [ SystemConfiguration ];
preConfigure = "./autotool.sh"; preConfigure = "./autotool.sh";
postInstall = '' postInstall = ''
@ -45,6 +49,7 @@ in stdenv.mkDerivation {
description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];
broken = stdenv.isDarwin;
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -14517,7 +14517,9 @@ in
libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; libtomcrypt = callPackage ../development/libraries/libtomcrypt { };
libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { }; libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
};
libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { }; libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { };