Commit 702ae09c authored by Sandro Jäckel's avatar Sandro Jäckel Committed by Rick van Schijndel
Browse files

ncmpcpp: remove ? null from inputs, remove with lib over entire scope

parent a21661c7
Loading
Loading
Loading
Loading
+9 −13
Original line number Diff line number Diff line
@@ -10,15 +10,11 @@
, icu
, curl
, outputsSupport ? true # outputs screen
, visualizerSupport ? false, fftw ? null # visualizer screen
, visualizerSupport ? false, fftw # visualizer screen
, clockSupport ? true # clock screen
, taglibSupport ? true, taglib ? null # tag editor
, taglibSupport ? true, taglib # tag editor
}:

assert visualizerSupport -> (fftw != null);
assert taglibSupport -> (taglib != null);

with lib;
stdenv.mkDerivation rec {
  pname = "ncmpcpp";
  version = "0.9.2";
@@ -30,18 +26,18 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;
  configureFlags = [ "BOOST_LIB_SUFFIX=" ]
    ++ optional outputsSupport "--enable-outputs"
    ++ optional visualizerSupport "--enable-visualizer --with-fftw"
    ++ optional clockSupport "--enable-clock"
    ++ optional taglibSupport "--with-taglib";
    ++ lib.optional outputsSupport "--enable-outputs"
    ++ lib.optional visualizerSupport "--enable-visualizer --with-fftw"
    ++ lib.optional clockSupport "--enable-clock"
    ++ lib.optional taglibSupport "--with-taglib";

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ boost libmpdclient ncurses readline libiconv icu curl ]
    ++ optional visualizerSupport fftw
    ++ optional taglibSupport taglib;
    ++ lib.optional visualizerSupport fftw
    ++ lib.optional taglibSupport taglib;

  meta = {
  meta = with lib; {
    description = "A featureful ncurses based MPD client inspired by ncmpc";
    homepage    = "https://rybczak.net/ncmpcpp/";
    changelog   = "https://github.com/ncmpcpp/ncmpcpp/blob/${version}/CHANGELOG.md";