diff --git a/pkgs/development/libraries/libtorrent-rasterbar/distutils.patch b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/distutils.patch similarity index 100% rename from pkgs/development/libraries/libtorrent-rasterbar/distutils.patch rename to pkgs/by-name/li/libtorrent-rasterbar-2_0_x/distutils.patch diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix similarity index 83% rename from pkgs/development/libraries/libtorrent-rasterbar/default.nix rename to pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 55c284987a9b..573fd5ad5b63 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchFromGitHub, cmake -, zlib, boost, openssl, python, ncurses, SystemConfiguration +, zlib, boost, openssl, python3, ncurses, darwin }: let version = "2.0.10"; # Make sure we override python, so the correct version is chosen - boostPython = boost.override { enablePython = true; inherit python; }; + boostPython = boost.override { enablePython = true; python = python3; }; in stdenv.mkDerivation { pname = "libtorrent-rasterbar"; @@ -22,8 +22,8 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ boostPython openssl zlib python ncurses ] - ++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; + buildInputs = [ boostPython openssl zlib python3 ncurses ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ]; patches = [ # provide distutils alternative for python 3.12 @@ -42,7 +42,7 @@ in stdenv.mkDerivation { postInstall = '' moveToOutput "include" "$dev" - moveToOutput "lib/${python.libPrefix}" "$python" + moveToOutput "lib/${python3.libPrefix}" "$python" ''; postFixup = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b08a863961ba..73fd44b1cf4f 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-2_0_x = callPackage ../development/libraries/libtorrent-rasterbar { - inherit (darwin.apple_sdk.frameworks) SystemConfiguration; - python = python3; - }; - libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix { inherit (darwin.apple_sdk.frameworks) SystemConfiguration; python = python3; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5cd47e370b09..e23d65b5ce22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6879,7 +6879,7 @@ self: super: with self; { libtmux = callPackage ../development/python-modules/libtmux { }; - libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; + libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar.override { python3 = python; })).python; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1;