kodi: 21.1 -> 21.2

This commit is contained in:
Aaron Andersen
2025-01-18 20:34:06 -05:00
parent 5df43628fd
commit 4bbd83f6d6
2 changed files with 3 additions and 24 deletions
@@ -1,13 +0,0 @@
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
+3 -11
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, fetchpatch, fetchzip
{ stdenv, lib, fetchFromGitHub, fetchzip
, autoconf, automake, libtool, makeWrapper
, pkg-config, cmake, yasm, python3Packages
, libxcrypt, libgcrypt, libgpg-error, libunistring
@@ -87,24 +87,16 @@ let
in stdenv.mkDerivation (finalAttrs: {
pname = "kodi";
version = "21.1";
version = "21.2";
kodiReleaseName = "Omega";
src = fetchFromGitHub {
owner = "xbmc";
repo = "xbmc";
rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}";
hash = "sha256-NjId1T1cw9dl0Fx1QDsijiN1VUpuQ/EFl1kxWSESCR4=";
hash = "sha256-RdTJcq6FPerQx05dU3r8iyaorT4L7162hg5RdywsA88=";
};
patches = [
./no-python-lib.patch
(fetchpatch {
url = "https://github.com/xbmc/xbmc/commit/32b04718c65a90f87e409674c4ef984b087b8657.patch";
hash = "sha256-I79thepzDOfw55r9gfaOp/Ri2FA0gouc+RgTc2Zh1Sw=";
})
];
# make derivations declared in the let binding available here, so
# they can be overridden
inherit libdvdcss libdvdnav libdvdread groovy