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

libtorrent-rasterbar-1_2_x: migrate to pkgs/by-name, unbreak on linux

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

12
pkgs/development/libraries/libtorrent-rasterbar/1.2.nix → pkgs/by-name/li/libtorrent-rasterbar-1_2_x/package.nix
View File

@ -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;
};
}

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

@ -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 { };