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

Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging

Browse Source 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
This commit is contained in:
Shea Levy
2015-02-11 19:37:22 -05:00
parent db4cb021c0 472feaf53b
commit 127efcd6f6
37 changed files with 88 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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";