From fa0d4eaa9b31d7e6f334e5c39011e7448fc67436 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 11 Apr 2024 00:45:14 +0530 Subject: [PATCH 1/2] spot: 0.4.0 -> 0.4.1 --- pkgs/applications/audio/spot/default.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index 7cf683beb918..183aae58d167 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -5,7 +5,6 @@ , meson , ninja , gettext -, python3 , desktop-file-utils , cargo , rustPlatform @@ -19,23 +18,25 @@ , alsa-lib , libpulseaudio , wrapGAppsHook4 +, blueprint-compiler +, gst_all_1 }: stdenv.mkDerivation rec { pname = "spot"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "xou816"; repo = "spot"; rev = version; - hash = "sha256-K6wGWhAUUGsbE4O+z0TmJcJyGarvHgZteY527jfAa90="; + hash = "sha256-F875e/VZyN8mTfe9lgjtILNxMqn+66XoPCdaEUagHyU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-eM2XLumn4dr2YtyUzBZJADlqdexc1iOaNJUudMlfSUc="; + hash = "sha256-45Rqs2/tSWoyZVjFuygR5SxldjoqpprtOKEnMqJK+p8="; }; nativeBuildInputs = [ @@ -43,7 +44,6 @@ stdenv.mkDerivation rec { meson ninja pkg-config - python3 # for meson postinstall script gtk4 # for gtk-update-icon-cache glib # for glib-compile-schemas desktop-file-utils @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { rustPlatform.cargoSetupHook rustc wrapGAppsHook4 + blueprint-compiler ]; buildInputs = [ @@ -61,18 +62,13 @@ stdenv.mkDerivation rec { openssl alsa-lib libpulseaudio + gst_all_1.gst-plugins-base + gst_all_1.gstreamer ]; # https://github.com/xou816/spot/issues/313 mesonBuildType = "release"; - postPatch = '' - chmod +x build-aux/cargo.sh - patchShebangs build-aux/cargo.sh build-aux/meson/postinstall.py - substituteInPlace build-aux/meson/postinstall.py \ - --replace gtk-update-icon-cache gtk4-update-icon-cache - ''; - passthru = { updateScript = nix-update-script { }; }; From cf1752d253c2ac1cf17b1d4aa551d5cb14782f17 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Sun, 14 Apr 2024 23:41:21 +0530 Subject: [PATCH 2/2] spot: make msfjarvis the maintainer --- pkgs/applications/audio/spot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/spot/default.nix b/pkgs/applications/audio/spot/default.nix index 183aae58d167..0e79962ba2db 100644 --- a/pkgs/applications/audio/spot/default.nix +++ b/pkgs/applications/audio/spot/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { mainProgram = "spot"; homepage = "https://github.com/xou816/spot"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ msfjarvis ]; platforms = platforms.linux; }; }