From 1ca3d78e13b9c88790c7eae9516c0f3c0f9ff000 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 25 Jun 2024 20:41:36 -0400 Subject: [PATCH] spot: refactor https://github.com/NixOS/nixpkgs/issues/208242 --- pkgs/by-name/sp/spot/package.nix | 61 ++++++++++++++++---------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/sp/spot/package.nix b/pkgs/by-name/sp/spot/package.nix index 77cabcc19634..2dcf3c090ef4 100644 --- a/pkgs/by-name/sp/spot/package.nix +++ b/pkgs/by-name/sp/spot/package.nix @@ -2,25 +2,25 @@ lib, stdenv, fetchFromGitHub, - nix-update-script, + rustPlatform, + cargo, + rustc, + alsa-lib, + blueprint-compiler, + desktop-file-utils, + gettext, + glib, + gst_all_1, + gtk4, + libadwaita, + libpulseaudio, + libhandy, meson, ninja, - gettext, - desktop-file-utils, - cargo, - rustPlatform, - rustc, - pkg-config, - glib, - libadwaita, - libhandy, - gtk4, + nix-update-script, openssl, - alsa-lib, - libpulseaudio, + pkg-config, wrapGAppsHook4, - blueprint-compiler, - gst_all_1, }: stdenv.mkDerivation rec { @@ -41,30 +41,30 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + cargo + rustc + blueprint-compiler + desktop-file-utils gettext + gtk4 # for gtk-update-icon-cache + glib # for glib-compile-schemas meson ninja pkg-config - gtk4 # for gtk-update-icon-cache - glib # for glib-compile-schemas - desktop-file-utils - cargo rustPlatform.cargoSetupHook - rustc wrapGAppsHook4 - blueprint-compiler ]; buildInputs = [ + alsa-lib glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer gtk4 libadwaita libhandy - openssl - alsa-lib libpulseaudio - gst_all_1.gst-plugins-base - gst_all_1.gstreamer + openssl ]; # https://github.com/xou816/spot/issues/313 @@ -74,12 +74,13 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Native Spotify client for the GNOME desktop"; - mainProgram = "spot"; homepage = "https://github.com/xou816/spot"; - license = licenses.mit; - maintainers = with maintainers; [ getchoo ]; - platforms = platforms.linux; + changelog = "https://github.com/xou816/spot/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ getchoo ]; + mainProgram = "spot"; + platforms = lib.platforms.linux; }; }