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

kill libiconvOr*

Browse Source 
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
This commit is contained in:
Eric Seidel
2015-02-07 20:29:28 -08:00
parent 362d759750
commit e08b9ab8d3
37 changed files with 88 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/audio/ncmpcpp/default.nix
+2 -3
View File
@@ -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)";