Unverified Commit 429b0b4b authored by seth's avatar seth
Browse files

ncspot: migrate to by-name

parent 8a4a23f0
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
{
  lib,
  stdenv,
  Cocoa,
  alsa-lib,
  config,
  darwin,
  dbus,
  fetchFromGitHub,
  libpulseaudio,
@@ -17,14 +18,14 @@
  rustPlatform,
  testers,
  ueberzug,
  withALSA ? false,
  withALSA ? stdenv.hostPlatform.isLinux,
  withClipboard ? true,
  withCover ? false,
  withCrossterm ? true,
  withMPRIS ? true,
  withMPRIS ? stdenv.hostPlatform.isLinux,
  withNotify ? true,
  withPortAudio ? false,
  withPulseAudio ? true,
  withPortAudio ? stdenv.hostPlatform.isDarwin,
  withPulseAudio ? config.pulseaudio or stdenv.hostPlatform.isLinux,
}:

rustPlatform.buildRustPackage rec {
@@ -51,7 +52,7 @@ rustPlatform.buildRustPackage rec {
    ++ lib.optional withPulseAudio libpulseaudio
    ++ lib.optional withPortAudio portaudio
    ++ lib.optional (withMPRIS || withNotify) dbus
    ++ lib.optional stdenv.hostPlatform.isDarwin Cocoa;
    ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Cocoa;

  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-DNCURSES_UNCTRL_H_incl";

+0 −9
Original line number Diff line number Diff line
@@ -31483,15 +31483,6 @@ with pkgs;
  ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };
  ncspot = callPackage ../applications/audio/ncspot {
    inherit (darwin.apple_sdk.frameworks) Cocoa;
    withALSA = stdenv.hostPlatform.isLinux;
    withPulseAudio = config.pulseaudio or stdenv.hostPlatform.isLinux;
    withPortAudio = stdenv.hostPlatform.isDarwin;
    withMPRIS = stdenv.hostPlatform.isLinux;
  };
  ncview = callPackage ../tools/X11/ncview { } ;
  ne = callPackage ../applications/editors/ne { };