cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

kodi: rename useWayland and useGbm flags to waylandSupport and gbmSupport

Browse source
This commit is contained in:
Aaron Andersen 2021-03-10 20:04:23 -05:00
parent ce0621ec4f
commit 4ef33dd12d
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/video/kodi/unwrapped.nix
View file

@ -28,9 +28,9 @@
, udevSupport ? true, udev ? null , udevSupport ? true, udev ? null
, usbSupport ? false, libusb-compat-0_1 ? null , usbSupport ? false, libusb-compat-0_1 ? null
, vdpauSupport ? true, libvdpau ? null , vdpauSupport ? true, libvdpau ? null
, useWayland ? false, wayland ? null, wayland-protocols ? null , waylandSupport ? false, wayland ? null, wayland-protocols ? null
, waylandpp ? null, libxkbcommon ? null , waylandpp ? null, libxkbcommon ? null
, useGbm ? false, mesa ? null, libinput ? null , gbmSupport ? false, mesa ? null, libinput ? null
, buildPackages , buildPackages
}: }:
@ -42,8 +42,8 @@ assert sambaSupport -> samba != null;
assert udevSupport -> udev != null; assert udevSupport -> udev != null;
assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable
assert vdpauSupport -> libvdpau != null; assert vdpauSupport -> libvdpau != null;
assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; assert waylandSupport -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null;
assert useGbm || useWayland || x11Support; assert gbmSupport || waylandSupport || x11Support;
let let
kodiReleaseDate = "20210219"; kodiReleaseDate = "20210219";
@ -106,13 +106,14 @@ let
}; };
kodi_platforms = kodi_platforms =
lib.optional useGbm "gbm" ++ lib.optional gbmSupport "gbm" ++
lib.optional useWayland "wayland" ++ lib.optional waylandSupport "wayland" ++
lib.optional x11Support "x11" lib.optional x11Support "x11"
; ;
in stdenv.mkDerivation { in stdenv.mkDerivation {
name = "kodi-${lib.optionalString useWayland "wayland-"}${kodiVersion}"; pname = "kodi";
version = kodiVersion;
src = kodi_src; src = kodi_src;
@ -150,14 +151,14 @@ in stdenv.mkDerivation {
++ lib.optional udevSupport udev ++ lib.optional udevSupport udev
++ lib.optional usbSupport libusb-compat-0_1 ++ lib.optional usbSupport libusb-compat-0_1
++ lib.optional vdpauSupport libvdpau ++ lib.optional vdpauSupport libvdpau
++ lib.optionals useWayland [ ++ lib.optionals waylandSupport [
wayland wayland
waylandpp.dev waylandpp.dev
wayland-protocols wayland-protocols
# Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise
libxkbcommon.dev libxkbcommon.dev
] ]
++ lib.optional useGbm [ ++ lib.optional gbmSupport [
libxkbcommon.dev libxkbcommon.dev
mesa.dev mesa.dev
libinput.dev libinput.dev
@ -174,14 +175,14 @@ in stdenv.mkDerivation {
# for TexturePacker # for TexturePacker
giflib zlib libpng libjpeg lzo giflib zlib libpng libjpeg lzo
] ++ lib.optionals useWayland [ wayland-protocols waylandpp.bin ]; ] ++ lib.optionals waylandSupport [ wayland-protocols waylandpp.bin ];
depsBuildBuild = [ depsBuildBuild = [
buildPackages.stdenv.cc buildPackages.stdenv.cc
]; ];
cmakeFlags = [ cmakeFlags = [
"-DAPP_RENDER_SYSTEM=${if useGbm then "gles" else "gl"}" "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"
"-Dlibdvdcss_URL=${libdvdcss}" "-Dlibdvdcss_URL=${libdvdcss}"
"-Dlibdvdnav_URL=${libdvdnav}" "-Dlibdvdnav_URL=${libdvdnav}"
"-Dlibdvdread_URL=${libdvdread}" "-Dlibdvdread_URL=${libdvdread}"
@ -193,7 +194,7 @@ in stdenv.mkDerivation {
"-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig"
"-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc"
"-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python" "-DPYTHON_EXECUTABLE=${buildPackages.python3Packages.python}/bin/python"
] ++ lib.optional useWayland [ ] ++ lib.optional waylandSupport [
"-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
]; ];

4
pkgs/top-level/all-packages.nix
View file

@ -26232,11 +26232,11 @@ in
kodi = callPackage ../applications/video/kodi { }; kodi = callPackage ../applications/video/kodi { };
kodi-wayland = callPackage ../applications/video/kodi { kodi-wayland = callPackage ../applications/video/kodi {
useWayland = true; waylandSupport = true;
}; };
kodi-gbm = callPackage ../applications/video/kodi { kodi-gbm = callPackage ../applications/video/kodi {
useGbm = true; gbmSupport = true;
}; };
kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-cli = callPackage ../tools/misc/kodi-cli { };