Merge pull request #326670 from getchoo/pkgs/spotifyd/adopt

spotifyd: 0.3.5-unstable-2024-02-18 -> 0.3.5-unstable-2024-07-10; enable `withKeyring` by default; refactor
2024-07-16 09:58:26 +05:30
parent 70fbdac057 93a6079c14
commit 08c92c831d
3 changed files with 82 additions and 56 deletions
@@ -1,49 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, rustPackages, pkg-config, openssl
-, withALSA ? true, alsa-lib
-, withPulseAudio ? false, libpulseaudio
-, withPortAudio ? false, portaudio
-, withMpris ? false
-, withKeyring ? false
-, dbus
-}:
-
-rustPackages.rustPlatform.buildRustPackage rec {
-  pname = "spotifyd";
-  version = "0.3.5-unstable-2024-02-18";
-
-  src = fetchFromGitHub {
-    owner = "Spotifyd";
-    repo = "spotifyd";
-    rev = "ff2f7a06e54bf05afd57a0243dc9f67abc15f040";
-    hash = "sha256-nebAd4a+ht+blRP52OF830/Dm15ZPwRL4IPWmmT9ViM=";
-  };
-
-  cargoHash = "sha256-6BRIMTrWTwvX3yIGEYEvigMT+n4EtaruMdrej2Dd49w=";
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = lib.optionals stdenv.isLinux [ openssl ]
-    ++ lib.optional withALSA alsa-lib
-    ++ lib.optional withPulseAudio libpulseaudio
-    ++ lib.optional withPortAudio portaudio
-    ++ lib.optional (withMpris || withKeyring) dbus;
-
-  buildNoDefaultFeatures = true;
-  buildFeatures = lib.optional withALSA "alsa_backend"
-    ++ lib.optional withPulseAudio "pulseaudio_backend"
-    ++ lib.optional withPortAudio "portaudio_backend"
-    ++ lib.optional withMpris "dbus_mpris"
-    ++ lib.optional withKeyring "dbus_keyring";
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Open source Spotify client running as a UNIX daemon";
-    homepage = "https://spotifyd.rs/";
-    changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ anderslundstedt Br1ght0ne ];
-    platforms = platforms.unix;
-    mainProgram = "spotifyd";
-  };
-}
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  config,
+  fetchFromGitHub,
+  rustPackages,
+  pkg-config,
+  openssl,
+  withALSA ? stdenv.isLinux,
+  alsa-lib,
+  withJack ? stdenv.isLinux,
+  libjack2,
+  withPulseAudio ? config.pulseaudio or stdenv.isLinux,
+  libpulseaudio,
+  withPortAudio ? stdenv.isDarwin,
+  portaudio,
+  withMpris ? stdenv.isLinux,
+  withKeyring ? true,
+  dbus,
+  nix-update-script,
+  testers,
+  spotifyd,
+}:
+
+rustPackages.rustPlatform.buildRustPackage rec {
+  pname = "spotifyd";
+  version = "0.3.5-unstable-2024-07-10";
+
+  src = fetchFromGitHub {
+    owner = "Spotifyd";
+    repo = "spotifyd";
+    rev = "8fb0b9a5cce46d2e99e127881a04fb1986e58008";
+    hash = "sha256-wEPdf5ylnmu/SqoaWHxAzIEUpdRhhZfdQ623zYzcU+s=";
+  };
+
+  cargoHash = "sha256-+xTmkp+hGzmz4XrfKqPCtlpsX8zLA8XgJWM1SPunjq4=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs =
+    lib.optionals stdenv.isLinux [ openssl ]
+    ++ lib.optional (withALSA || withJack) alsa-lib
+    ++ lib.optional withJack libjack2
+    ++ lib.optional withPulseAudio libpulseaudio
+    ++ lib.optional withPortAudio portaudio
+    # The `dbus_keying` feature works on other platforms, but only requires
+    # `dbus` on Linux
+    ++ lib.optional ((withMpris || withKeyring) && stdenv.isLinux) dbus;
+
+  buildNoDefaultFeatures = true;
+  buildFeatures =
+    lib.optional withALSA "alsa_backend"
+    ++ lib.optional withJack "rodiojack_backend"
+    ++ lib.optional withPulseAudio "pulseaudio_backend"
+    ++ lib.optional withPortAudio "portaudio_backend"
+    ++ lib.optional withMpris "dbus_mpris"
+    ++ lib.optional withKeyring "dbus_keyring";
+
+  doCheck = false;
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = spotifyd;
+      version = builtins.head (lib.splitString "-" version);
+    };
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+  };
+
+  meta = {
+    description = "Open source Spotify client running as a UNIX daemon";
+    homepage = "https://spotifyd.rs/";
+    changelog = "https://github.com/Spotifyd/spotifyd/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      anderslundstedt
+      Br1ght0ne
+      getchoo
+    ];
+    platforms = lib.platforms.unix;
+    mainProgram = "spotifyd";
+  };
+}
@@ -31339,13 +31339,6 @@ with pkgs;

  spotify-cli-linux = callPackage ../applications/audio/spotify-cli-linux { };

-  spotifyd = callPackage ../applications/audio/spotifyd {
-    withALSA = stdenv.isLinux;
-    withPulseAudio = config.pulseaudio or stdenv.isLinux;
-    withPortAudio = stdenv.isDarwin;
-    withMpris = stdenv.isLinux;
-  };
-
  srain = callPackage ../applications/networking/irc/srain { };

  super-productivity = callPackage ../applications/office/super-productivity { };