Merge pull request #303183 from msfjarvis/hs/spot-0.4.1

spot: 0.4.0 -> 0.4.1
This commit is contained in:
Peder Bergebakken Sundt 2024-04-25 00:43:53 +02:00 committed by GitHub
commit 3284649dfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -5,7 +5,6 @@
, meson , meson
, ninja , ninja
, gettext , gettext
, python3
, desktop-file-utils , desktop-file-utils
, cargo , cargo
, rustPlatform , rustPlatform
@ -19,23 +18,25 @@
, alsa-lib , alsa-lib
, libpulseaudio , libpulseaudio
, wrapGAppsHook4 , wrapGAppsHook4
, blueprint-compiler
, gst_all_1
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "spot"; pname = "spot";
version = "0.4.0"; version = "0.4.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "xou816"; owner = "xou816";
repo = "spot"; repo = "spot";
rev = version; rev = version;
hash = "sha256-K6wGWhAUUGsbE4O+z0TmJcJyGarvHgZteY527jfAa90="; hash = "sha256-F875e/VZyN8mTfe9lgjtILNxMqn+66XoPCdaEUagHyU=";
}; };
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit src;
name = "${pname}-${version}"; name = "${pname}-${version}";
hash = "sha256-eM2XLumn4dr2YtyUzBZJADlqdexc1iOaNJUudMlfSUc="; hash = "sha256-45Rqs2/tSWoyZVjFuygR5SxldjoqpprtOKEnMqJK+p8=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -43,7 +44,6 @@ stdenv.mkDerivation rec {
meson meson
ninja ninja
pkg-config pkg-config
python3 # for meson postinstall script
gtk4 # for gtk-update-icon-cache gtk4 # for gtk-update-icon-cache
glib # for glib-compile-schemas glib # for glib-compile-schemas
desktop-file-utils desktop-file-utils
@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
rustc rustc
wrapGAppsHook4 wrapGAppsHook4
blueprint-compiler
]; ];
buildInputs = [ buildInputs = [
@ -61,18 +62,13 @@ stdenv.mkDerivation rec {
openssl openssl
alsa-lib alsa-lib
libpulseaudio libpulseaudio
gst_all_1.gst-plugins-base
gst_all_1.gstreamer
]; ];
# https://github.com/xou816/spot/issues/313 # https://github.com/xou816/spot/issues/313
mesonBuildType = "release"; 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 = { passthru = {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
}; };
@ -82,7 +78,7 @@ stdenv.mkDerivation rec {
mainProgram = "spot"; mainProgram = "spot";
homepage = "https://github.com/xou816/spot"; homepage = "https://github.com/xou816/spot";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ msfjarvis ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }