From 7c0ea48e2dc1de8b5cb924c0ee264f6361595604 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 11 Nov 2024 07:11:34 -0600 Subject: [PATCH 1/2] mopidy: format file --- pkgs/applications/audio/mopidy/mopidy.nix | 40 +++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 12eab45c52a2..958706bac4e7 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -1,5 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, pythonPackages, wrapGAppsNoGuiHook -, gst_all_1, glib-networking, gobject-introspection +{ + lib, + stdenv, + fetchFromGitHub, + pythonPackages, + wrapGAppsNoGuiHook, + gst_all_1, + glib-networking, + gobject-introspection, }: pythonPackages.buildPythonApplication rec { @@ -24,17 +31,22 @@ pythonPackages.buildPythonApplication rec { gst-plugins-rs ]; - propagatedBuildInputs = [ - gobject-introspection - ] ++ (with pythonPackages; [ - gst-python - pygobject3 - pykka - requests - setuptools - tornado - ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python - ); + propagatedBuildInputs = + [ + gobject-introspection + ] + ++ ( + with pythonPackages; + [ + gst-python + pygobject3 + pykka + requests + setuptools + tornado + ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) dbus-python + ); propagatedNativeBuildInputs = [ gobject-introspection @@ -49,6 +61,6 @@ pythonPackages.buildPythonApplication rec { mainProgram = "mopidy"; license = licenses.asl20; maintainers = [ maintainers.fpletz ]; - hydraPlatforms = []; + hydraPlatforms = [ ]; }; } From 9cdc8770231b93adc65c74219868f48b4d51e7a6 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Mon, 11 Nov 2024 07:13:38 -0600 Subject: [PATCH 2/2] mopidy: include the PipeWire GStreamer plugin --- pkgs/applications/audio/mopidy/mopidy.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 958706bac4e7..b82d17d06cd4 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -7,6 +7,7 @@ gst_all_1, glib-networking, gobject-introspection, + pipewire, }: pythonPackages.buildPythonApplication rec { @@ -55,6 +56,12 @@ pythonPackages.buildPythonApplication rec { # There are no tests doCheck = false; + preFixup = '' + gappsWrapperArgs+=( + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${pipewire}/lib/gstreamer-1.0" + ) + ''; + meta = with lib; { homepage = "https://www.mopidy.com/"; description = "Extensible music server that plays music from local disk, Spotify, SoundCloud, and more";