Merge master into staging-next

2021-05-17 06:22:23 +00:00
parent d8e62d8e41 e906410c9a
commit 3ff6965554
154 changed files with 1062 additions and 1089 deletions
@@ -45,7 +45,7 @@ let
  kodi_src = fetchFromGitHub {
    owner  = "xbmc";
    repo   = "xbmc";
-    rev    = "v${kodiVersion}";
+    rev    = "${kodiVersion}-${rel}";
    sha256 = "0jh67vw3983lnfgqzqfislawwbpq0vxxk1ljsg7mar06mlwfxb7h";
  };