diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-11 19:37:22 -0500 |
| commit | 127efcd6f6bf5870b43efe588e37c28994ea94fa (patch) | |
| tree | bc9d5201e0809ea8ae47c38e7ce0d2fb15e7870e /pkgs/applications/audio/ncmpcpp | |
| parent | db4cb021c024b65c08a3791edf2d4c613e8d44d8 (diff) | |
| parent | 472feaf53becef9cc0551babc44a1f5db3beed51 (diff) | |
| download | nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.gz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.bz2 nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.lz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.xz nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.tar.zst nixlib-127efcd6f6bf5870b43efe588e37c28994ea94fa.zip | |
Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv Conflicts: pkgs/applications/audio/ncmpcpp/default.nix
Diffstat (limited to 'pkgs/applications/audio/ncmpcpp')
| -rw-r--r-- | pkgs/applications/audio/ncmpcpp/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 5eef35aa0610..52c079791ac1 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, boost, mpd_clientlib, ncurses, pkgconfig, readline -, libiconvOrEmpty +, libiconv , outputsSupport ? false # outputs screen , visualizerSupport ? false, fftw ? null # visualizer screen , clockSupport ? false # clock screen @@ -30,11 +30,10 @@ stdenv.mkDerivation rec { ++ optional curlSupport "--with-curl" ++ optional taglibSupport "--with-taglib"; - buildInputs = [ boost mpd_clientlib ncurses pkgconfig readline ] + buildInputs = [ boost mpd_clientlib ncurses pkgconfig readline libiconv ] ++ optional curlSupport curl ++ optional visualizerSupport fftw - ++ optional taglibSupport taglib - ++ libiconvOrEmpty; + ++ optional taglibSupport taglib; meta = { description = "A featureful ncurses based MPD client inspired by ncmpc"; |