diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/applications/audio/ncmpcpp | |
parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
download | nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.gz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.bz2 nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.lz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.xz nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.tar.zst nixlib-e08b9ab8d3d6362c774a786797347fa7483af773.zip |
kill libiconvOr*
Conflicts: pkgs/applications/networking/mailreaders/sup/default.nix pkgs/development/compilers/ghc/7.8.3-binary.nix pkgs/development/interpreters/php/5.3.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/poppler/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/applications/audio/ncmpcpp')
-rw-r--r-- | pkgs/applications/audio/ncmpcpp/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index e83e5a8ca74e..15ce54f2bca3 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, ncurses, curl, taglib, fftw, mpd_clientlib, pkgconfig -, libiconvOrEmpty, boost, readline }: +, libiconv, boost, readline }: stdenv.mkDerivation rec { version = "0.6.2"; @@ -12,8 +12,7 @@ stdenv.mkDerivation rec { configureFlags = "BOOST_LIB_SUFFIX="; - buildInputs = [ ncurses curl taglib fftw mpd_clientlib boost pkgconfig readline ] - ++ libiconvOrEmpty; + buildInputs = [ ncurses curl taglib fftw mpd_clientlib boost pkgconfig readline libiconv]; meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; |