From e08b9ab8d3d6362c774a786797347fa7483af773 Mon Sep 17 00:00:00 2001 From: Eric Seidel Date: Wed, 26 Nov 2014 15:16:50 -0800 Subject: 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 --- pkgs/applications/networking/feedreaders/newsbeuter/default.nix | 5 ++--- pkgs/applications/networking/feedreaders/newsbeuter/dev.nix | 5 ++--- pkgs/applications/networking/p2p/twister/default.nix | 6 +++--- 3 files changed, 7 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/networking') diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix index e5f18f72cedc..183df058effb 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses -, gettext, libiconvOrEmpty, makeWrapper, perl }: +, gettext, libiconv, makeWrapper, perl }: stdenv.mkDerivation rec { name = "newsbeuter-2.8"; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { buildInputs # use gettext instead of libintlOrEmpty so we have access to the msgfmt # command - = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ] - ++ libiconvOrEmpty + = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl libiconv ] ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; preBuild = '' diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix index 4390360ff9e8..a254535dd703 100644 --- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix +++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses -, gettext, libiconvOrEmpty, makeWrapper, perl }: +, gettext, libiconv, makeWrapper, perl }: stdenv.mkDerivation rec { name = "newsbeuter-dev-20140309"; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { buildInputs # use gettext instead of libintlOrEmpty so we have access to the msgfmt # command - = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl ] - ++ libiconvOrEmpty + = [ pkgconfig sqlite curl libxml2 stfl json-c-0-11 ncurses gettext perl libiconv ] ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; preBuild = '' diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index e6fd674e9e7c..c762edb857ba 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python -, boost, db, openssl, geoip, libiconvOrEmpty, miniupnpc +, boost, db, openssl, geoip, libiconv, miniupnpc , srcOnly, fetchgit }: @@ -33,8 +33,8 @@ in stdenv.mkDerivation rec { buildInputs = [ autoconf automake libtool pkgconfig python - boost db openssl geoip miniupnpc - ] ++ libiconvOrEmpty; + boost db openssl geoip miniupnpc libiconv + ]; postPatch = '' sed -i -e '/-htmldir/s|(default: [^)]*)|(default: ${twisterHTML})|' \ -- cgit 1.4.1