Unverified Commit 4874b784 authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

libtorrent-rasterbar: 2.0.11 -> 2.0.12 (#504569)

parents 59bf97c4 85cb4f8c

pkgs/by-name/li/libtorrent-rasterbar-2_0_x/distutils.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
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

pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix

+3 −4
Original line number Diff line number Diff line
@@ -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

pkgs/by-name/li/libtorrent-rasterbar-2_0_x/python-destdir.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
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")