diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-17 13:52:37 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-17 13:52:37 -0500 |
| commit | 2f061ff16b3c54ce8c85bef4f873c1548be9b1c3 (patch) | |
| tree | 728d5e8d790ececee0c464099dd5eaa69b19ebdf /pkgs/applications/networking | |
| parent | 6be3ffb0d4d1c8f35c89c9525a7e6e11995637c7 (diff) | |
| parent | ef6b18c0ecc4f484e0ee31144527be7ff6c42697 (diff) | |
| download | nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.gz nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.bz2 nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.lz nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.xz nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.tar.zst nixlib-2f061ff16b3c54ce8c85bef4f873c1548be9b1c3.zip | |
Merge remote-tracking branch 'origin/staging'
Darwin and haskell fixes.
Diffstat (limited to 'pkgs/applications/networking')
3 files changed, 7 insertions, 9 deletions
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})|' \ |