From 619a42f81a3252a81ad64248cd2459c676d31e5f Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 14 Nov 2024 08:53:31 -0600 Subject: [PATCH 1/2] rygel: format --- pkgs/by-name/ry/rygel/package.nix | 110 ++++++++++++++++-------------- 1 file changed, 58 insertions(+), 52 deletions(-) diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index 4f512d820c63..cc5fb932eaec 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -1,32 +1,33 @@ -{ stdenv -, lib -, fetchurl -, docbook-xsl-nons -, meson -, ninja -, pkg-config -, vala -, gettext -, libxml2 -, libxslt -, gobject-introspection -, wrapGAppsHook3 -, python3 -, glib -, gssdp_1_6 -, gupnp_1_6 -, gupnp-av -, gupnp-dlna -, gst_all_1 -, libgee -, libsoup_3 -, gtk3 -, libmediaart -, sqlite -, systemd -, tinysparql -, shared-mime-info -, gnome +{ + stdenv, + lib, + fetchurl, + docbook-xsl-nons, + meson, + ninja, + pkg-config, + vala, + gettext, + libxml2, + libxslt, + gobject-introspection, + wrapGAppsHook3, + python3, + glib, + gssdp_1_6, + gupnp_1_6, + gupnp-av, + gupnp-dlna, + gst_all_1, + libgee, + libsoup_3, + gtk3, + libmediaart, + sqlite, + systemd, + tinysparql, + shared-mime-info, + gnome, }: stdenv.mkDerivation (finalAttrs: { @@ -34,7 +35,10 @@ stdenv.mkDerivation (finalAttrs: { version = "0.44.1"; # TODO: split out lib - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchurl { url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz"; @@ -59,28 +63,30 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; - buildInputs = [ - glib - gssdp_1_6 - gupnp_1_6 - gupnp-av - gupnp-dlna - libgee - libsoup_3 - gtk3 - libmediaart - sqlite - systemd - tinysparql - shared-mime-info - ] ++ (with gst_all_1; [ - gstreamer - gst-editing-services - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - ]); + buildInputs = + [ + glib + gssdp_1_6 + gupnp_1_6 + gupnp-av + gupnp-dlna + libgee + libsoup_3 + gtk3 + libmediaart + sqlite + systemd + tinysparql + shared-mime-info + ] + ++ (with gst_all_1; [ + gstreamer + gst-editing-services + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + ]); mesonFlags = [ "-Dsystemd-user-units-dir=${placeholder "out"}/lib/systemd/user" From 816a7437f985fc136fe991f4e264856ecfbc8323 Mon Sep 17 00:00:00 2001 From: Jordan Williams Date: Thu, 14 Nov 2024 08:54:59 -0600 Subject: [PATCH 2/2] rygel: include the PipeWire GStreamer plugin --- pkgs/by-name/ry/rygel/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index cc5fb932eaec..ef80b1b35a39 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -23,6 +23,7 @@ libsoup_3, gtk3, libmediaart, + pipewire, sqlite, systemd, tinysparql, @@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: { libsoup_3 gtk3 libmediaart + pipewire sqlite systemd tinysparql