From c66ab42fa3c713dd3f226006491542e98f432fcc Mon Sep 17 00:00:00 2001 From: jaredmontoya <49511278+jaredmontoya@users.noreply.github.com> Date: Tue, 31 Mar 2026 21:11:18 +0200 Subject: [PATCH] songrec: 0.4.3 -> 0.6.7 https://github.com/marin-m/SongRec/releases/tag/0.6.7 Packaging changes: - Replace gtk3 with gtk4, libadwaita, libsoup_3, gdk-pixbuf - Add wrapGAppsHook4 for proper GLib/GTK4 environment wrapping - Add glib-networking for TLS support via GIO modules - Remove openssl (not used; soup3 uses glib-networking for TLS) - Move ffmpeg from buildInputs to runtime PATH (only used via subprocess) - Fix license: gpl3Only -> gpl3Plus (matches upstream Cargo.toml) --- pkgs/by-name/so/songrec/package.nix | 37 +++++++++++++++++++---------- 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/so/songrec/package.nix b/pkgs/by-name/so/songrec/package.nix index 55b1dc56d9e5..9de4c5154238 100644 --- a/pkgs/by-name/so/songrec/package.nix +++ b/pkgs/by-name/so/songrec/package.nix @@ -2,39 +2,52 @@ lib, rustPlatform, fetchFromGitHub, - gtk3, - openssl, + gtk4, + libadwaita, + libsoup_3, + glib-networking, alsa-lib, pkg-config, + wrapGAppsHook4, ffmpeg, - dbus, + glib, libpulseaudio, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "songrec"; - version = "0.4.3"; + version = "0.6.7"; src = fetchFromGitHub { owner = "marin-m"; repo = "songrec"; rev = finalAttrs.version; - hash = "sha256-pTonrxlYvfuLRKMXW0Lao4KCoNFlMzE9rH+hwpa60JY="; + hash = "sha256-lCwFMBQ6IimNtXYMfTnFOpwOO2qbwijOEZ+oMsQKAP0="; }; - cargoHash = "sha256-wSRn1JY067RVqGGdiox87+zRb2/2OMcvKLYZE1QUs/s="; + cargoHash = "sha256-BhDFGkvY6c8XbhJpFX1w8CSXK9IY/HiysNoooytFT9I="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook4 + ]; buildInputs = [ alsa-lib - dbus - gtk3 - openssl - ffmpeg + glib + glib-networking + gtk4 + libadwaita libpulseaudio + libsoup_3 ]; + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" + ) + ''; + postInstall = '' mv packaging/rootfs/usr/share $out/share ''; @@ -42,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Open-source Shazam client for Linux, written in Rust"; homepage = "https://github.com/marin-m/SongRec"; - license = lib.licenses.gpl3Only; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ tcbravo ]; mainProgram = "songrec";