From 4bbd83f6d6456abcf2ec7e9d5bb6d44bbf676d7c Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 18 Jan 2025 19:38:02 -0500 Subject: [PATCH] kodi: 21.1 -> 21.2 --- pkgs/applications/video/kodi/no-python-lib.patch | 13 ------------- pkgs/applications/video/kodi/unwrapped.nix | 14 +++----------- 2 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 pkgs/applications/video/kodi/no-python-lib.patch diff --git a/pkgs/applications/video/kodi/no-python-lib.patch b/pkgs/applications/video/kodi/no-python-lib.patch deleted file mode 100644 index d45e02dd1846..000000000000 --- a/pkgs/applications/video/kodi/no-python-lib.patch +++ /dev/null @@ -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 diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 4866a2b9f23e..9cfcfc6072f4 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -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