JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #82558 from tilpner/ncspot-mpris

Browse Source 
ncspot: enable MPRIS by default
This commit is contained in:
Mario Rodas 2020-04-02 08:43:35 -05:00 committed by GitHub
commit aa8bd52698
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/audio/ncspot/default.nix
View File

@ -2,13 +2,15 @@
, withALSA ? true, alsaLib ? null , withALSA ? true, alsaLib ? null
, withPulseAudio ? false, libpulseaudio ? null , withPulseAudio ? false, libpulseaudio ? null
, withPortAudio ? false, portaudio ? null , withPortAudio ? false, portaudio ? null
, withMPRIS ? false, dbus ? null
}: }:
let let
features = [ "cursive/pancurses-backend" ] features = [ "cursive/pancurses-backend" ]
++ lib.optional withALSA "alsa_backend" ++ lib.optional withALSA "alsa_backend"
++ lib.optional withPulseAudio "pulseaudio_backend" ++ lib.optional withPulseAudio "pulseaudio_backend"
++ lib.optional withPortAudio "portaudio_backend"; ++ lib.optional withPortAudio "portaudio_backend"
++ lib.optional withMPRIS "mpris";
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ncspot"; pname = "ncspot";
@ -30,7 +32,8 @@ rustPlatform.buildRustPackage rec {
buildInputs = [ ncurses openssl ] buildInputs = [ ncurses openssl ]
++ lib.optional withALSA alsaLib ++ lib.optional withALSA alsaLib
++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPulseAudio libpulseaudio
++ lib.optional withPortAudio portaudio; ++ lib.optional withPortAudio portaudio
++ lib.optional withMPRIS dbus;
doCheck = false; doCheck = false;

1
pkgs/top-level/all-packages.nix
View File

@ -21013,6 +21013,7 @@ in
withALSA = stdenv.isLinux; withALSA = stdenv.isLinux;
withPulseAudio = config.pulseaudio or stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux;
withPortAudio = stdenv.isDarwin; withPortAudio = stdenv.isDarwin;
withMPRIS = stdenv.isLinux;
}; };
ncview = callPackage ../tools/X11/ncview { } ; ncview = callPackage ../tools/X11/ncview { } ;