gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

branch-cleanup: adjust to master

Browse Source 
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
This commit is contained in:
Florian Brandes
2025-10-11 08:55:34 +02:00
parent 2658d73a2b
commit 0b09c6740e
1 changed files with 98 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
pkgs/applications/video/kodi/unwrapped.nix
View File

@@ -359,107 +359,107 @@ stdenv.mkDerivation (
lirc lirc
mesa-gl-headers mesa-gl-headers
# Deps needed by TexturePacker, which is built and installed in normal # Deps needed by TexturePacker, which is built and installed in normal
# kodi build, however the one used during the build is not this one # kodi build, however the one used during the build is not this one
# in order to support cross-compilation. # in order to support cross-compilation.
giflib giflib
zlib zlib
] ]
++ lib.optionals x11Support [ ++ lib.optionals x11Support [
libX11 libX11
xorgproto xorgproto
libXt libXt
libXmu libXmu
libXext.dev libXext.dev
libXdmcp libXdmcp
libXinerama libXinerama
libXrandr.dev libXrandr.dev
libXtst libXtst
libXfixes libXfixes
] ]
++ lib.optional dbusSupport dbus ++ lib.optional dbusSupport dbus
++ lib.optional joystickSupport cwiid ++ lib.optional joystickSupport cwiid
++ lib.optional nfsSupport libnfs ++ lib.optional nfsSupport libnfs
++ lib.optional pulseSupport libpulseaudio ++ lib.optional pulseSupport libpulseaudio
++ lib.optional pipewireSupport pipewire ++ lib.optional pipewireSupport pipewire
++ lib.optional rtmpSupport rtmpdump ++ lib.optional rtmpSupport rtmpdump
++ lib.optional sambaSupport samba ++ lib.optional sambaSupport samba
++ 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 waylandSupport [ ++ 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.optionals gbmSupport [ ++ lib.optionals gbmSupport [
libxkbcommon.dev libxkbcommon.dev
libgbm libgbm
libinput.dev libinput.dev
libdisplay-info libdisplay-info
]; ];
nativeBuildInputs = nativeBuildInputs = [
[ cmake
cmake doxygen
doxygen makeWrapper
makeWrapper which
which pkg-config
pkg-config autoconf
autoconf automake
automake libtool # still needed for some components. Check if that is the case with 19.0
libtool # still needed for some components. Check if that is the case with 19.0 jre_headless
jre_headless yasm
yasm gettext
gettext python3Packages.python
python3Packages.python flatbuffers
flatbuffers ]
] ++ lib.optionals waylandSupport [
++ lib.optionals waylandSupport [ wayland-protocols
wayland-protocols waylandpp.bin
waylandpp.bin ];
];
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [
buildPackages.stdenv.cc
];
cmakeFlags = cmakeFlags = [
[ "-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}"
"-DAPP_RENDER_SYSTEM=${if gbmSupport then "gles" else "gl"}" "-Dlibdvdcss_URL=${finalAttrs.libdvdcss}"
"-Dlibdvdcss_URL=${finalAttrs.libdvdcss}" "-Dlibdvdnav_URL=${finalAttrs.libdvdnav}"
"-Dlibdvdnav_URL=${finalAttrs.libdvdnav}" "-Dlibdvdread_URL=${finalAttrs.libdvdread}"
"-Dlibdvdread_URL=${finalAttrs.libdvdread}" "-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}"
"-Dgroovy_SOURCE_DIR=${finalAttrs.groovy}" "-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}"
"-Dapache-commons-lang_SOURCE_DIR=${finalAttrs.apache_commons_lang}" "-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}"
"-Dapache-commons-text_SOURCE_DIR=${finalAttrs.apache_commons_text}" # Upstream derives this from the git HEADs hash and date.
# Upstream derives this from the git HEADs hash and date. # LibreElec (minimal distro for kodi) uses the equivalent to this.
# LibreElec (minimal distro for kodi) uses the equivalent to this. "-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}"
"-DGIT_VERSION=${finalAttrs.version}-${finalAttrs.kodiReleaseName}" "-DENABLE_EVENTCLIENTS=ON"
"-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF"
"-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_INTERNAL_RapidJSON=OFF"
"-DENABLE_INTERNAL_RapidJSON=OFF" "-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}"
"-DENABLE_OPTICAL=${if opticalSupport then "ON" else "OFF"}" "-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}"
"-DENABLE_VDPAU=${if vdpauSupport then "ON" else "OFF"}" "-DLIRC_DEVICE=/run/lirc/lircd"
"-DLIRC_DEVICE=/run/lirc/lircd" "-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" "-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}"
"-DPYTHON_LIB_PATH=${python3Packages.python.sitePackages}" "-DWITH_JSONSCHEMABUILDER=${lib.getExe jsonSchemaBuilder}"
"-DWITH_JSONSCHEMABUILDER=${lib.getExe jsonSchemaBuilder}" # When wrapped KODI_HOME will likely contain symlinks to static assets
# When wrapped KODI_HOME will likely contain symlinks to static assets # that Kodi's built in webserver will cautiously refuse to serve up
# that Kodi's built in webserver will cautiously refuse to serve up # (because their realpaths are outside of KODI_HOME and the other
# (because their realpaths are outside of KODI_HOME and the other # whitelisted directories). This adds the entire nix store to the Kodi
# whitelisted directories). This adds the entire nix store to the Kodi # webserver whitelist to avoid this problem.
# webserver whitelist to avoid this problem. "-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}"
"-DKODI_WEBSERVER_EXTRA_WHITELIST=${builtins.storeDir}" ]
] ++ lib.optionals waylandSupport [
++ lib.optionals waylandSupport [ "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++"
"-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" ]
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DWITH_TEXTUREPACKER=${lib.getExe texturePacker}"
"-DWITH_TEXTUREPACKER=${lib.getExe texturePacker}" ];
];
# 14 tests fail but the biggest issue is that every test takes 30 seconds - # 14 tests fail but the biggest issue is that every test takes 30 seconds -
# I'm guessing there is a thing waiting to time out # I'm guessing there is a thing waiting to time out