From b101b25cef84b545dd5486f60849bcd66c99022c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 8 Dec 2020 02:54:58 +0100 Subject: [PATCH] libtorrent-rasterbar: Fix build on darwin but still fails with some python issue --- .../libtorrent-rasterbar/1.2/default.nix | 15 ++++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix index 91e5a54bab1..1233dcb3933 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix @@ -1,10 +1,10 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf -, zlib, boost, openssl, libtool, python, libiconv, ncurses +{ stdenv, fetchFromGitHub, pkg-config, automake, autoconf +, zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration }: let version = "1.2.6"; - formattedVersion = lib.replaceChars ["."] ["_"] version; + formattedVersion = stdenv.lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen # for the bindings, if overridden @@ -22,8 +22,12 @@ in stdenv.mkDerivation { }; 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"; postInstall = '' @@ -45,6 +49,7 @@ in stdenv.mkDerivation { description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ maintainers.phreedom ]; + broken = stdenv.isDarwin; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3bbed7d39b..30f21946dd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14517,7 +14517,9 @@ in 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 { };