diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/video/kodi')
39 files changed, 144 insertions, 144 deletions
diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix index abcdefaf02dd..f3b363dca0f8 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/addon-update-script/default.nix @@ -9,7 +9,7 @@ { attrPath }: let - url = "http://mirrors.kodi.tv/addons/nexus/addons.xml.gz"; + url = "http://mirrors.kodi.tv/addons/omega/addons.xml.gz"; updateScript = writeShellScript "update.sh" '' set -ex diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix index 363b41035e00..2515ce7853fc 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/arrow/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, typing_extensions }: buildKodiAddon rec { pname = "arrow"; namespace = "script.module.arrow"; version = "1.2.3"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/script.module.arrow/script.module.arrow-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.module.arrow/script.module.arrow-${version}.zip"; sha256 = "sha256-Et+9FJT1dRE1dFOrAQ70HJJcfylyLsiyay9wPJcSOXs="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix index 287735d246e7..8311a5068021 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, requests, xbmcswift2 }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, dateutil, requests, xbmcswift2 }: buildKodiAddon rec { pname = "arteplussept"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.4.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; hash = "sha256-dqxGKaOnEYOI33Aw76zbjma5z7MqOUh367dFsV87olU="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix index 13ed0c1e4585..ecab49746a27 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/certifi/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, cacert }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, cacert }: buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; version = "2023.5.7"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-NQbjx+k9fnQMYLLMR5+N5NSuDcXEzZjlhGPA3qSmjfI="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix index 5d3fd8421db9..8d385e717b8a 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/chardet/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "chardet"; namespace = "script.module.chardet"; version = "5.1.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-cIQIX6LVAoGf1sBRKWonXJd3XYqGOa5WIUttabV0HeU="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index 30b54c2adae2..cfaef2bb7f98 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -14,6 +14,8 @@ let postPatch = '' # remove addons already included in the base kodi package rm -r addons/game.controller.default + rm -r addons/game.controller.keyboard + rm -r addons/game.controller.mouse rm -r addons/game.controller.snes ''; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix index 9adcf3303bb5..b0fadcf8a862 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/dateutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six }: buildKodiAddon rec { pname = "dateutil"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.8.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-iQnyS0GjYcPbnBDUxmMrmDxHOA3K8RbTVke/HF4d5u4="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix index 12a9f82e3f6e..1c6a844e0a30 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/defusedxml/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "defusedxml"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.6.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-jSl7lbFqR6hjZhHzxY69hDbs84LY3B5RYKzXnHou0Qg="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix index c8078ff36d5a..8812fbd8f5b3 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/future/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "future"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.18.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-jKO2Qxi54z6UiCmMkxU+2pog40K2yb8/KYbNPFYuSsQ="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix index d752cb93b01a..76a6e81b0072 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/idna/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; version = "3.4.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-wS1d1L18v4+RGwxDh7OpKRHB2A4qYwiq6b5mAz7l8Pk="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix index cb85df276412..677467d34396 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix @@ -1,22 +1,22 @@ -{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, expat, glib, nspr, nss, gtest }: +{ stdenv, lib, rel, addonDir, buildKodiBinaryAddon, fetchFromGitHub, pugixml, glib, nspr, nss, gtest }: let bento4 = fetchFromGitHub { owner = "xbmc"; repo = "Bento4"; - rev = "1.6.0-639-7-Omega"; - sha256 = "sha256-d3znV88dLMbA4oUWsTZ7vS6WHOWzN7lIHgWPkR5Aixo="; + rev = "1.6.0-641-${rel}"; + sha256 = "sha256-vsFMDzH8JJecYw0qWKGCxnd/m5wn62mCKE2g2HwQhwI="; }; in buildKodiBinaryAddon rec { pname = "inputstream-adaptive"; namespace = "inputstream.adaptive"; - version = "20.3.18"; + version = "21.4.4"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.adaptive"; rev = "${version}-${rel}"; - sha256 = "sha256-cjlUKrus4Dv48dCk6AlOgY2iZYTwT39tj2u7aq1P104="; + sha256 = "sha256-Nzlm1AW/nW9chQAourKF0o2FSQmsr1MNhJ4gEO0/9sM="; }; extraCMakeFlags = [ @@ -26,7 +26,7 @@ buildKodiBinaryAddon rec { extraNativeBuildInputs = [ gtest ]; - extraBuildInputs = [ expat ]; + extraBuildInputs = [ pugixml ]; extraRuntimeDependencies = [ glib nspr nss stdenv.cc.cc.lib ]; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix index fc3256855917..ffb0a0cf83a7 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-ffmpegdirect"; namespace = "inputstream.ffmpegdirect"; - version = "unstable-20.5.0"; + version = "21.3.5"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.ffmpegdirect"; - rev = rel; - sha256 = "sha256-+u28Wzp2TonL5jaa5WJUr9igR6KiaxizZAX9jqqBUns="; + rev = "${version}-${rel}"; + sha256 = "sha256-pPufkDPHq5EsvC6YTsRX9TjqjIczOL/6Vc5HGDIe9Gk="; }; extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ]; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix index 561ef2cc5577..960c50ce09e7 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/inputstream-rtmp/default.nix @@ -3,13 +3,13 @@ buildKodiBinaryAddon rec { pname = "inputstream-rtmp"; namespace = "inputstream.rtmp"; - version = "20.3.0"; + version = "21.1.0"; src = fetchFromGitHub { owner = "xbmc"; repo = "inputstream.rtmp"; rev = "${version}-${rel}"; - sha256 = "sha256-VF2DpQXXU+rj76e/de5YB1T7dzeOjmO0dpsPVqEnMy4="; + sha256 = "sha256-M6LFokWQRzBZ7inzRsMxyWzkV0XsGHh4d0CPhv1NCfI="; }; extraBuildInputs = [ openssl rtmpdump zlib ]; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix index ceafe3b9c5ff..97cc417e6bf1 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/inputstreamhelper/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; version = "0.6.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-v5fRikswmP+KVbxYibD0NbCK8leUnFbya5EtF1FmS0I="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix index e5d26ef4a64c..36ae8608837d 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.2.6"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.video.invidious/plugin.video.invidious-${version}+nexus.0.zip"; sha256 = "sha256-XnlnhvtHMh4uQTupW/SSOmaEV8xZrL61/6GoRpyKR0o="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 1e570ab51131..7623a3c4db13 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -5,13 +5,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.12"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-m8msTBim4Ss8XaYqIn6GWXxoCio5ABbqhhgyb1T/Yhg="; + sha256 = "sha256-yCgsQnzmlmyYAjp1q0J9QxGDRg5JCd23H9xgVozHiGM="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix index ff710cdedef3..e98e5ca2cb41 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/keymap/default.nix @@ -1,13 +1,13 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, defusedxml, kodi-six }: buildKodiAddon rec { pname = "keymap"; namespace = "script.keymap"; - version = "1.1.5"; + version = "1.2.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-wSztipTEGIqw1icsz+ziNxYuRZOFt3C66T1Ifap/ta0="; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; + sha256 = "sha256-AtIufZbOi3MW7aSOAlON8csJheJqAbuBtKIX0sX6zIw="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix index 638b7c3b500b..a9c7547aa371 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/kodi-six/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "kodi-six"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.1.3.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-nWz5CPoE0uVsZvWjI4q6y4ZKUnraTjTXLSJ1mK4YopI="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/mediacccde/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/mediacccde/default.nix index 9c09078557ed..a0d334633fe1 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/mediacccde/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/mediacccde/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, routing }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, routing }: buildKodiAddon rec { pname = "media.ccc.de"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "0.3.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.video.media-ccc-de/plugin.video.media-ccc-de-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.video.media-ccc-de/plugin.video.media-ccc-de-${version}.zip"; hash = "sha256-T8J2HtPVDfaPU0gZEa0xVBzwjNInxkRFCCSxS53QhmU="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix index dac308ab5837..a162e844ed55 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/myconnpy/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "myconnpy"; namespace = "script.module.myconnpy"; version = "8.0.33"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-NlLMq9RAdWu8rVsMc0FDe1HmQiVp5T7iBXbIH7HB5bI="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix index 2bff3b6d19b3..3b3aa97d5343 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.23.2"; + version = "1.23.3"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - hash = "sha256-/wHKwFZbuxK0iwlqvZpyfi0lnRkjm/HSn221IgCN7VQ="; + hash = "sha256-tve7E7dK60BIHETdwt9hD3/5eEdJB6c6rhw4oDoLAKM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix index 901d1d65716c..71e0e1744b78 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix @@ -17,5 +17,7 @@ buildKodiAddon rec { platforms = platforms.all; maintainers = with maintainers; [ ]; license = licenses.cc-by-nc-sa-30; + + broken = true; # no release for kodi 21 }; } diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix index bb556e9ec822..45e0e845acb7 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/radioparadise/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: buildKodiAddon rec { pname = "radioparadise"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.0.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/script.radioparadise/script.radioparadise-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/script.radioparadise/script.radioparadise-${version}.zip"; sha256 = "sha256-eRCP0XMQHmyDrZ8Y6RGFfxQ1r26/bWbE/PJz4PET7D8="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix index 6800ecde832a..3a71019d9ccb 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/requests-cache/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests }: buildKodiAddon rec { pname = "requests-cache"; namespace = "script.module.requests-cache"; version = "0.5.2+matrix.2"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-6M/v/ghS2TnSZhG8bREjxfEfcfLOmvA6hgsa7JUk9Dk="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix index e21dac1ef3a0..4950d63608eb 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/requests/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, certifi, chardet, idna, urllib3 }: buildKodiAddon rec { pname = "requests"; namespace = "script.module.requests"; version = "2.31.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-05BSD5aoN2CTnjqaSKYMb93j5nIfLvpJHyeQsK++sTw="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix index a96c16b8629c..9c87c69e9912 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/routing/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "routing"; namespace = "script.module.routing"; version = "0.2.3+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-piPmY8Q3NyIeImmkYhDwmQhBiwwcV0X532xV1DogF+I="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix index 4d84bcafeeef..9f7496f3c4ca 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/signals/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "signals"; namespace = "script.module.addon.signals"; version = "0.0.6+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-WsLR7iUh5F+LXMISBpWx71dLAtg/AMYF6BsiyKZakuE="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix index b0a04402d3b1..2889e38e960f 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/simplejson/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "simplejson"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "3.19.1+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-RJy75WAr0XmXnSrPjqKhFjWJnWo3c5IEtUGumcE/mRo="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix index 5ce4817eae3b..80bbefe39a11 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/six/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "six"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.16.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-d6BNpnTg6K7NPX3uWp5X0rog33C+B7YoAtLH/CrUYno="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/somafm/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/somafm/default.nix index 4ffc69791298..e2d5ca38bf44 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/somafm/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/somafm/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "somafm"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.0.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/plugin.audio.somafm/plugin.audio.somafm-${version}.zip"; sha256 = "sha256-auPLm7QFabU4tXJPjTl17KpE+lqWM2Edbd2HrXPRx40="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/svtplay/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/svtplay/default.nix index 7cc94bc435a5..8c12ac47ca3f 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/svtplay/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/svtplay/default.nix @@ -23,5 +23,7 @@ buildKodiAddon rec { platforms = platforms.all; license = licenses.gpl3Plus; maintainers = teams.kodi.members; + + broken = true; # no release for kodi 21 }; } diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix index 1c9680147cb5..37816f89e363 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/trakt-module/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, requests, six, arrow }: buildKodiAddon rec { pname = "trakt-module"; namespace = "script.module.trakt"; version = "4.4.0+matrix.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-6JIAQwot5VZ36gvQym88BD/e/mSyS8WO8VqkPn2GcqY="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix index 4967a5cd8fba..bf360072becc 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/trakt/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, trakt-module, dateutil }: buildKodiAddon rec { pname = "trakt"; namespace = "script.trakt"; version = "3.6.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-ZlBucYYRA1cL5c0H1jhXeKE1itReZe2gAJYFFxuUebo="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix index fd52528b7ca0..d2fc31c99bcd 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/typing_extensions/default.nix @@ -1,11 +1,11 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "typing_extensions"; namespace = "script.module.typing_extensions"; version = "4.7.1"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-bCGPl5fGVyptCenpNXP/Msi7hu+UdtZd2ms7MfzbsbM="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix index 8d13052b950e..9cfc54797e87 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/urllib3/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript }: buildKodiAddon rec { pname = "urllib3"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "2.1.0"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-UCvkeguxytPoP1gIIt8N79TVs98ATzsfrRSabtbgnGc="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix index c2bbe9de09b6..6d0ecc55aa05 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/websocket/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: +{ lib, rel, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: buildKodiAddon rec { pname = "websocket"; @@ -6,7 +6,7 @@ buildKodiAddon rec { version = "1.6.4"; src = fetchzip { - url = "https://mirrors.kodi.tv/addons/nexus/${namespace}/${namespace}-${version}.zip"; + url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; sha256 = "sha256-1Wy+hxB059UoZnQlncytVT3sQ07dYAhNRnW3/QVD4ZE="; }; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix index eecfd54433dd..f2f340b257db 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.4"; + version = "7.0.6"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-vBDFxsbYemJKxWa7De++UB0E4t1Eo0PW6Glbw6+FK1w="; + hash = "sha256-pxW45D/tppUTTgeR5wVteOP2f4TZ4wl/9A5IBhOZhTM="; }; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/kodi/default.nix b/nixpkgs/pkgs/applications/video/kodi/default.nix index 3f382efff11b..b028558a61da 100644 --- a/nixpkgs/pkgs/applications/video/kodi/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/default.nix @@ -1,14 +1,18 @@ { callPackage, ... } @ args: let unwrapped = callPackage ./unwrapped.nix (removeAttrs args [ "callPackage" ]); - kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = unwrapped; }; in unwrapped.overrideAttrs (oldAttrs: { - passthru = oldAttrs.passthru // { - packages = kodiPackages; - withPackages = func: callPackage ./wrapper.nix { - kodi = unwrapped; - addons = kodiPackages.requiredKodiAddons (func kodiPackages); - }; - }; + passthru = + let + finalKodi = oldAttrs.passthru.kodi; + kodiPackages = callPackage ../../../top-level/kodi-packages.nix { kodi = finalKodi; }; + in + oldAttrs.passthru // { + packages = kodiPackages; + withPackages = func: callPackage ./wrapper.nix { + kodi = finalKodi; + addons = kodiPackages.requiredKodiAddons (func kodiPackages); + }; + }; }) diff --git a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index f97b53b60937..e8e5b5844f1f 100644 --- a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -1,14 +1,13 @@ -{ stdenv, lib, fetchFromGitHub -, fetchpatch +{ stdenv, lib, fetchFromGitHub, fetchzip , autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame , gettext, pcre-cpp, yajl, fribidi, which -, openssl, gperf, tinyxml2, taglib, libssh, swig, jre_headless +, openssl, gperf, tinyxml2, tinyxml-2, taglib, libssh, swig, jre_headless , gtest, ncurses, spdlog , libxml2, systemd -, alsa-lib, libGLU, libGL, fontconfig, freetype, ftgl +, alsa-lib, libGLU, libGL, ffmpeg, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -29,11 +28,12 @@ , rtmpSupport ? true, rtmpdump , sambaSupport ? true, samba , udevSupport ? true, udev +, opticalSupport ? true , usbSupport ? false, libusb-compat-0_1 , vdpauSupport ? true, libvdpau , waylandSupport ? false, wayland, wayland-protocols , waylandpp ? null, libxkbcommon -, gbmSupport ? false, mesa, libinput +, gbmSupport ? false, mesa, libinput, libdisplay-info , buildPackages }: @@ -41,54 +41,8 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20240302"; - kodiVersion = "20.5"; - rel = "Nexus"; - - kodi_src = fetchFromGitHub { - owner = "xbmc"; - repo = "xbmc"; - rev = "${kodiVersion}-${rel}"; - hash = "sha256-R/tzk3ZarJ4BTR312p2lTLezeCEsqdQH54ROsNIoJZA="; - }; - # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies - # kodi 20.0 moved to ffmpeg 5, *but* there is a bug making the compilation fail which will - # only been fixed in kodi 21, so stick to ffmpeg 4 for now - ffmpeg = stdenv.mkDerivation rec { - pname = "kodi-ffmpeg"; - version = "4.4.1"; - src = fetchFromGitHub { - owner = "xbmc"; - repo = "FFmpeg"; - rev = "${version}-${rel}-Alpha1"; - sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII="; - }; - patches = [ - # Backport fix for binutils-2.41. - (fetchpatch { - name = "binutils-2.41.patch"; - url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; - hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; - }) - ]; - preConfigure = '' - cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . - sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt - sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt - ''; - cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-DCROSSCOMPILING=ON" - "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" - "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" - "-DPKG_CONFIG_EXECUTABLE=pkg-config" - ]; - buildInputs = [ libidn2 libtasn1 p11-kit zlib libva ] - ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; - }; - # We can build these externally but FindLibDvd.cmake forces us to build it # them, so we currently just use them for the src. libdvdcss = fetchFromGitHub { @@ -112,21 +66,48 @@ let sha256 = "sha256-AphBQhXud+a6wm52zjzC5biz53NnqWdgpL2QDt2ZuXc="; }; + groovy = fetchzip { + url = "mirror://apache/groovy/4.0.16/distribution/apache-groovy-binary-4.0.16.zip"; + sha256 = "sha256-OfZBiMVrhw6VqHRHCSC7ZV3FiZ26n4+F8hsskk+L6yU="; + }; + + apache_commons_lang = fetchzip { + url = "mirror://apache/commons/lang/binaries/commons-lang3-3.14.0-bin.zip"; + sha512 = "sha512-eKF1IQ6PDtifb4pMHWQ2SYHIh0HbMi3qpc92lfbOo3uSsFJVR3n7JD0AdzrG17tLJQA4z5PGDhwyYw0rLeLsXw=="; + }; + + apache_commons_text = fetchzip { + url = "mirror://apache/commons/text/binaries/commons-text-1.11.0-bin.zip"; + sha512 = "sha512-P2IvnrHSYRF70LllTMI8aev43h2oe8lq6rrMYw450PEhEa7OuuCjh1Krnc/A4OqENUcidVAAX5dK1RAsZHh8Dg=="; + }; + kodi_platforms = lib.optional gbmSupport "gbm" ++ lib.optional waylandSupport "wayland" ++ lib.optional x11Support "x11"; -in stdenv.mkDerivation { +in stdenv.mkDerivation (finalAttrs: { pname = "kodi"; - version = kodiVersion; + version = "21.0"; + kodiReleaseName = "Omega"; + + src = fetchFromGitHub { + owner = "xbmc"; + repo = "xbmc"; + rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}"; + hash = "sha256-xrFWqgwTkurEwt3/+/e4SCM6Uk9nxuW62SrCFWWqZO0="; + }; + + # make derivations declared in the let binding available here, so + # they can be overridden + inherit libdvdcss libdvdnav libdvdread groovy + apache_commons_lang apache_commons_text; - src = kodi_src; buildInputs = [ gnutls libidn2 libtasn1 nasm p11-kit libxml2 python3Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm - openssl gperf tinyxml2 taglib libssh + openssl gperf tinyxml2 tinyxml-2 taglib libssh gtest ncurses spdlog alsa-lib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff @@ -168,6 +149,7 @@ in stdenv.mkDerivation { libxkbcommon.dev mesa.dev libinput.dev + libdisplay-info ]; nativeBuildInputs = [ @@ -189,14 +171,20 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}" - "-Dlibdvdcss_URL=${libdvdcss}" - "-Dlibdvdnav_URL=${libdvdnav}" - "-Dlibdvdread_URL=${libdvdread}" - "-DGIT_VERSION=${kodiReleaseDate}" + "-Dlibdvdcss_URL=${finalAttrs.libdvdcss}" + "-Dlibdvdnav_URL=${finalAttrs.libdvdnav}" + "-Dlibdvdread_URL=${finalAttrs.libdvdread}" + "-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}" + "-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}" + "-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}" + # Upstream derives this from the git HEADs hash and date. + # LibreElec (minimal distro for kodi) uses the equivalent to this. + "-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}" "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_INTERNAL_RapidJSON=OFF" - "-DENABLE_OPTICAL=ON" + "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}" + "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}" "-DLIRC_DEVICE=/run/lirc/lircd" "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" @@ -239,7 +227,8 @@ in stdenv.mkDerivation { --prefix PATH ":" "${lib.makeBinPath ([ python3Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo ++ lib.optional sambaSupport samba)}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - ([ curl systemd libmad libvdpau libcec libcec_platform libass ] + ([ curl systemd libmad libcec libcec_platform libass ] + ++ lib.optional vdpauSupport libvdpau ++ lib.optional nfsSupport libnfs ++ lib.optional rtmpSupport rtmpdump)}" done @@ -258,6 +247,7 @@ in stdenv.mkDerivation { passthru = { pythonPackages = python3Packages; ffmpeg = ffmpeg; + kodi = finalAttrs.finalPackage; }; meta = with lib; { @@ -267,4 +257,4 @@ in stdenv.mkDerivation { platforms = platforms.linux; maintainers = teams.kodi.members; }; -} +}) |