diff options
| -rw-r--r-- | pkgs/applications/video/kodi/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 8edc99c5f028..8246212280a2 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -30,6 +30,7 @@ , vdpauSupport ? true, libvdpau ? null , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null +, useGbm ? false, mesa ? null, libinput ? null }: assert dbusSupport -> dbus != null; @@ -183,6 +184,11 @@ in stdenv.mkDerivation { wayland waylandpp # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev + ] + ++ lib.optional useGbm [ + libxkbcommon.dev + mesa.dev + libinput.dev ]; nativeBuildInputs = [ @@ -206,6 +212,9 @@ in stdenv.mkDerivation { ] ++ lib.optional useWayland [ "-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl" + ] ++ lib.optional useGbm [ + "-DCORE_PLATFORM_NAME=gbm" + "-DGBM_RENDER_SYSTEM=gles" ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae495eb019ba..594c26d16552 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22074,6 +22074,8 @@ in kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiGBM = callPackage ../applications/video/kodi { useGbm = true; }; + kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodi = wrapKodi { @@ -22084,6 +22086,10 @@ in kodi = kodiPlainWayland; }; + kodi-gbm = wrapKodi { + kodi = kodiGBM; + }; + kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = |