Unverified Commit 49c4747a authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #324669 from K900/kodi-next 

[staging-next] kodi: fix build with Python 3.12
parents 164b5167 17d592a6

pkgs/applications/video/kodi/no-python-lib.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake

index 9c45c91774..763d6acab4 100644

--- a/cmake/scripts/linux/Install.cmake

+++ b/cmake/scripts/linux/Install.cmake

@@ -199,8 +199,6 @@ install(FILES ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/scripts/${APP_NAME}Config.cm

 

 if(ENABLE_EVENTCLIENTS)

   find_package(PythonInterpreter REQUIRED)

-  execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=''))"

-                  OUTPUT_VARIABLE PYTHON_LIB_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)

   # Install kodi-eventclients-common BT python files

   install(PROGRAMS ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/__init__.py

                    ${CMAKE_SOURCE_DIR}/tools/EventClients/lib/python/bt/bt.py

pkgs/applications/video/kodi/unwrapped.nix

+6 −1
Original line number Diff line number Diff line 
{ stdenv, lib, fetchFromGitHub, fetchzip

{ stdenv, lib, fetchFromGitHub, fetchzip, fetchpatch

, autoconf, automake, libtool, makeWrapper

, pkg-config, cmake, yasm, python3Packages

, libxcrypt, libgcrypt, libgpg-error, libunistring
@@ -97,6 +97,10 @@ in stdenv.mkDerivation (finalAttrs: { 
      hash  = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0=";

    };



    patches = [

      ./no-python-lib.patch

    ];



    # make  derivations declared in the let binding available here, so

    # they can be overridden

    inherit libdvdcss libdvdnav libdvdread groovy
@@ -189,6 +193,7 @@ in stdenv.mkDerivation (finalAttrs: { 
      "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"

      "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"

      "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"

      "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"

      # When wrapped KODI_HOME will likely contain symlinks to static assets

      # that Kodi's built in webserver will cautiously refuse to serve up

      # (because their realpaths are outside of KODI_HOME and the other