mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-06-05 21:03:40 +00:00
libtorrent-rasterbar: 2.0.11 -> 2.0.12
This commit is contained in:
@@ -1,20 +0,0 @@
|
||||
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
|
||||
index 2f4de4854..a68d547e6 100644
|
||||
--- a/bindings/python/CMakeLists.txt
|
||||
+++ b/bindings/python/CMakeLists.txt
|
||||
@@ -95,8 +95,13 @@ if (python-install-system-dir)
|
||||
else()
|
||||
execute_process(
|
||||
COMMAND "${Python3_EXECUTABLE}" -c [=[
|
||||
-import distutils.sysconfig
|
||||
-print(distutils.sysconfig.get_python_lib(prefix='', plat_specific=True))
|
||||
+try:
|
||||
+ import distutils.sysconfig
|
||||
+ print(distutils.sysconfig.get_python_lib(prefix='', plat_specific=True))
|
||||
+except ModuleNotFoundError:
|
||||
+ import os, sys
|
||||
+ version = f"{sys.version_info.major}.{sys.version_info.minor}"
|
||||
+ print(os.sep.join(["lib", f"python{version}", "site-packages"]))
|
||||
]=]
|
||||
OUTPUT_VARIABLE _PYTHON3_SITE_ARCH
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
@@ -17,14 +17,14 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "libtorrent-rasterbar";
|
||||
version = "2.0.11";
|
||||
version = "2.0.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "arvidn";
|
||||
repo = "libtorrent";
|
||||
tag = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-iph42iFEwP+lCWNPiOJJOejISFF6iwkGLY9Qg8J4tyo=";
|
||||
hash = "sha256-JbNOKzB830VQkZjC8ZAmzbu/7nkAgyD8cOr22uYbIGQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -40,8 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
strictDeps = true;
|
||||
|
||||
patches = [
|
||||
# provide distutils alternative for python 3.12
|
||||
./distutils.patch
|
||||
./python-destdir.patch
|
||||
];
|
||||
|
||||
# https://github.com/arvidn/libtorrent/issues/6865
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
|
||||
index 4e8ee816b..ff1981d84 100644
|
||||
--- a/bindings/python/CMakeLists.txt
|
||||
+++ b/bindings/python/CMakeLists.txt
|
||||
@@ -106,7 +106,7 @@ endif()
|
||||
message(STATUS "Python 3 site packages: ${_PYTHON3_SITE_ARCH}")
|
||||
message(STATUS "Python 3 extension suffix: ${Python3_SOABI}")
|
||||
|
||||
-install(TARGETS python-libtorrent DESTINATION "${_PYTHON3_SITE_ARCH}")
|
||||
+install(TARGETS python-libtorrent DESTINATION "\$ENV{DESTDIR}${_PYTHON3_SITE_ARCH}")
|
||||
|
||||
if (python-egg-info)
|
||||
set(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.cmake.in")
|
||||
Reference in New Issue
Block a user