From adaa6b740ac1765eb67022bc850d389e9d0e5bdf Mon Sep 17 00:00:00 2001 From: DashieTM Date: Thu, 18 Apr 2024 14:32:27 +0200 Subject: [PATCH 1/2] ncspot: Adjust defaults to upstream --- pkgs/applications/audio/ncspot/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index e70a2eb26f17..dd217a03e0af 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -6,12 +6,13 @@ , ncurses , openssl , Cocoa -, withALSA ? true, alsa-lib +, withALSA ? false, alsa-lib , withClipboard ? true, libxcb, python3 , withCover ? false, ueberzug -, withPulseAudio ? false, libpulseaudio +, withPulseAudio ? true, libpulseaudio , withPortAudio ? false, portaudio , withMPRIS ? true, withNotify ? true, dbus +, withCross ? true , nix-update-script , testers , ncspot @@ -54,6 +55,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPortAudio "portaudio_backend" ++ lib.optional withMPRIS "mpris" + ++ lib.optional withCross "crossterm_backend" ++ lib.optional withNotify "notify"; postInstall = '' From 93c36c006ac81d9894b2280d11c1ea336b159351 Mon Sep 17 00:00:00 2001 From: DashieTM Date: Fri, 19 Apr 2024 11:13:24 +0200 Subject: [PATCH 2/2] ncspot: Rename dependency Cross to Crossterm --- pkgs/applications/audio/ncspot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index dd217a03e0af..597f87337cae 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -12,7 +12,7 @@ , withPulseAudio ? true, libpulseaudio , withPortAudio ? false, portaudio , withMPRIS ? true, withNotify ? true, dbus -, withCross ? true +, withCrossterm ? true , nix-update-script , testers , ncspot @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPortAudio "portaudio_backend" ++ lib.optional withMPRIS "mpris" - ++ lib.optional withCross "crossterm_backend" + ++ lib.optional withCrossterm "crossterm_backend" ++ lib.optional withNotify "notify"; postInstall = ''