gst_all_1,mopidy: Fix overridden builds (#395981) (a5c7029f) · Commits · nix / nixpkgs

pkgs/applications/audio/mopidy/mopidy.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -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=";
		};
		});

+293 −317

File changed.

Preview size limit exceeded, changes collapsed.

+13 −0

Original line number	Diff line number	Diff line
		@@ -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 { };
		};

+28 −4

Original line number	Diff line number	Diff line
		@@ -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,
		}:

		let
		# MMAL is not supported on aarch64, see:
		# https://github.com/raspberrypi/userland/issues/688
		assert raspiCameraSupport -> (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch32);
		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 { };
		};

+16 −7

Original line number	Diff line number	Diff line
		@@ -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,7 +283,14 @@ stdenv.mkDerivation (finalAttrs: {
		runHook postInstallCheck
		'';

		passthru.updateScript = nix-update-script {
		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 = [
		@@ -290,6 +298,7 @@ stdenv.mkDerivation (finalAttrs: {
		"([0-9.]+)"
		];
		};
		};

		meta = with lib; {
		description = "GStreamer plugins written in Rust";