diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix similarity index 72% rename from pkgs/development/libraries/libtorrent-rasterbar/1.2.nix rename to pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix index d1cc52592215..928f827e32a5 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, pkg-config, automake, autoconf -, zlib, boost, openssl, libtool, python, libiconv, ncurses, SystemConfiguration +, zlib, boost, openssl, libtool, python311, libiconv, ncurses, darwin }: let @@ -7,7 +7,7 @@ let # 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; python = python311; }; in stdenv.mkDerivation { pname = "libtorrent-rasterbar"; @@ -24,14 +24,14 @@ in stdenv.mkDerivation { nativeBuildInputs = [ automake autoconf libtool pkg-config ]; - buildInputs = [ boostPython openssl zlib python libiconv ncurses ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + buildInputs = [ boostPython openssl zlib python311 libiconv ncurses ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; preConfigure = "./autotool.sh"; postInstall = '' moveToOutput "include" "$dev" - moveToOutput "lib/${python.libPrefix}" "$python" + moveToOutput "lib/${python311.libPrefix}" "$python" ''; outputs = [ "out" "dev" "python" ]; @@ -48,7 +48,7 @@ in stdenv.mkDerivation { description = "C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ ]; - broken = true; # ModuleNotFoundError: No module named 'distutils' + broken = stdenv.isDarwin; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73fd44b1cf4f..c293373dae04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22625,11 +22625,6 @@ with pkgs; libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - python = python3; - }; - libtorrent-rasterbar = libtorrent-rasterbar-2_0_x; libtpms = callPackage ../tools/security/libtpms { };