gst_all_1,mopidy: Fix overridden builds (#395981)

This commit is contained in:
Vladimír Čunát
2025-04-06 16:47:35 +02:00
6 changed files with 358 additions and 329 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ pythonPackages.buildPythonApplication rec {
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (oldAttrs': {
vendorStaging = oldAttrs'.vendorStaging.overrideAttrs {
inherit (newAttrs) patches;
outputHash = "sha256-CegT8h+CJ6axipAD6E9drtrPJ9izRy/UCW14rbva5XA=";
outputHash = "sha256-urRYH5N1laBq1/SUEmwFKAtsHAC+KWYfYp+fmb7Ey7s=";
};
});
File diff suppressed because it is too large Load Diff
@@ -112,6 +112,7 @@
enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
hotdoc,
guiSupport ? true,
gst-plugins-bad,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -412,6 +413,18 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = false; # fails 20 out of 58 tests, expensive
passthru = {
tests = {
full = gst-plugins-bad.override {
enableZbar = true;
faacSupport = true;
opencvSupport = true;
};
lgplOnly = gst-plugins-bad.override {
enableGplPlugins = false;
};
};
updateScript = directoryListingUpdater { };
};
@@ -60,12 +60,17 @@
# Checks meson.is_cross_build(), so even canExecute isn't enough.
enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
hotdoc,
gst-plugins-good,
directoryListingUpdater,
}:
# MMAL is not supported on aarch64, see:
# https://github.com/raspberrypi/userland/issues/688
assert raspiCameraSupport -> (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32);
let
# MMAL is not supported on aarch64, see:
# https://github.com/raspberrypi/userland/issues/688
hostSupportsRaspiCamera = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32;
in
assert raspiCameraSupport -> hostSupportsRaspiCamera;
stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-good";
@@ -250,7 +255,8 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs \
scripts/extract-release-date-from-doap-file.py
scripts/extract-release-date-from-doap-file.py \
ext/qt6/qsb-wrapper.py
'';
env = {
@@ -267,6 +273,24 @@ stdenv.mkDerivation (finalAttrs: {
dontWrapQtApps = true;
passthru = {
tests =
{
gtk = gst-plugins-good.override {
gtkSupport = true;
};
qt5 = gst-plugins-good.override {
qt5Support = true;
};
qt6 = gst-plugins-good.override {
qt6Support = true;
};
}
// lib.optionalAttrs hostSupportsRaspiCamera {
raspiCamera = gst-plugins-good.override {
raspiCameraSupport = true;
};
};
updateScript = directoryListingUpdater { };
};
@@ -34,6 +34,7 @@
# Checks meson.is_cross_build(), so even canExecute isn't enough.
enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null,
hotdoc,
mopidy,
}:
let
@@ -282,13 +283,21 @@ stdenv.mkDerivation (finalAttrs: {
runHook postInstallCheck
'';
passthru.updateScript = nix-update-script {
# use numbered releases rather than gstreamer-* releases
# this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772
extraArgs = [
"--version-regex"
"([0-9.]+)"
];
passthru = {
tests = {
# Applies patches.
# TODO: remove with 0.14
inherit mopidy;
};
updateScript = nix-update-script {
# use numbered releases rather than gstreamer-* releases
# this matches upstream's recommendation: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/470#note_2202772
extraArgs = [
"--version-regex"
"([0-9.]+)"
];
};
};
meta = with lib; {
@@ -24,6 +24,7 @@
enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform,
hotdoc,
directoryListingUpdater,
gst-plugins-ugly,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -100,6 +101,12 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru = {
tests = {
lgplOnly = gst-plugins-ugly.override {
enableGplPlugins = false;
};
};
updateScript = directoryListingUpdater { };
};