talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

libtorrent-rasterbar-2_0_x: migrate to pkgs/by-name

Browse Source
This commit is contained in:
éclairevoyant 2024-07-07 12:10:27 -04:00
parent 53c7e0f174
commit e224800f93
No known key found for this signature in database
GPG Key ID: E3813AEAA02DB54B
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/libtorrent-rasterbar/distutils.patch → pkgs/by-name/li/libtorrent-rasterbar-2_0_x/distutils.patch
View File

10
pkgs/development/libraries/libtorrent-rasterbar/default.nix → pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix
View File

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, cmake { lib, stdenv, fetchFromGitHub, cmake
, zlib, boost, openssl, python, ncurses, SystemConfiguration , zlib, boost, openssl, python3, ncurses, darwin
}: }:
let let
version = "2.0.10"; version = "2.0.10";
# Make sure we override python, so the correct version is chosen # 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 { in stdenv.mkDerivation {
pname = "libtorrent-rasterbar"; pname = "libtorrent-rasterbar";
@ -22,8 +22,8 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = [ boostPython openssl zlib python ncurses ] buildInputs = [ boostPython openssl zlib python3 ncurses ]
++ lib.optionals stdenv.isDarwin [ SystemConfiguration ]; ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
patches = [ patches = [
# provide distutils alternative for python 3.12 # provide distutils alternative for python 3.12
@ -42,7 +42,7 @@ in stdenv.mkDerivation {
postInstall = '' postInstall = ''
moveToOutput "include" "$dev" moveToOutput "include" "$dev"
moveToOutput "lib/${python.libPrefix}" "$python" moveToOutput "lib/${python3.libPrefix}" "$python"
''; '';
postFixup = '' postFixup = ''

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

@ -22625,11 +22625,6 @@ with pkgs;
libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; 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 { libtorrent-rasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2.nix {
inherit (darwin.apple_sdk.frameworks) SystemConfiguration; inherit (darwin.apple_sdk.frameworks) SystemConfiguration;
python = python3; python = python3;

2
pkgs/top-level/python-packages.nix
View File

@ -6879,7 +6879,7 @@ self: super: with self; {
libtmux = callPackage ../development/python-modules/libtmux { }; 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 { libusb1 = callPackage ../development/python-modules/libusb1 {
inherit (pkgs) libusb1; inherit (pkgs) libusb1;