libiconv: update to 1.14

pkgs/applications/misc/gammu/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl
-, libiconv, gettext, sqlite }:
+, libiconvOrNull, gettext, sqlite }:
 
 with stdenv.lib;
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./bashcomp-dir.patch ];
 
-  buildInputs = [ python pkgconfig cmake bluez libusb1 curl libiconv
+  buildInputs = [ python pkgconfig cmake bluez libusb1 curl libiconvOrNull
     gettext sqlite ];
 
   enableParallelBuilding = true;

pkgs/applications/networking/p2p/twister/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, python
-, boost, db, openssl, geoip, libiconv, miniupnpc
+, boost, db, openssl, geoip, libiconvOrNull, miniupnpc
 , srcOnly, fetchgit
 }:
 
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     autoconf automake libtool pkgconfig python
-    boost db openssl geoip libiconv miniupnpc
+    boost db openssl geoip libiconvOrNull miniupnpc
   ];
 
   postPatch = ''

pkgs/applications/science/astronomy/stellarium/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconv }:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt4, perl, libiconvOrNull }:
 
 stdenv.mkDerivation rec {
   name = "stellarium-0.12.4";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "11367hv9niyz9v47lf31vjsqkgc8da0vy2nhiyxgmk1i49p1pbhg";
   };
 
-  buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconv ];
+  buildInputs = [ cmake freetype libpng mesa gettext openssl qt4 perl libiconvOrNull ];
 
   enableParallelBuilding = true;
 

pkgs/applications/video/aegisub/default.nix

@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , libX11, gettext, wxGTK
-, libiconv, fontconfig, freetype
+, libiconvOrNull, fontconfig, freetype
 , mesa
 , libass, fftw, ffms
 , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-  [ intltool libX11 gettext wxGTK libiconv fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ]
+  [ intltool libX11 gettext wxGTK libiconvOrNull fontconfig freetype mesa libass fftw ffms ffmpeg pkgconfig zlib icu boost boost.lib ]
   ++ optional spellChecking hunspell
   ++ optional automationSupport lua
   ++ optional openalSupport openal

pkgs/development/interpreters/ruby/patches.nix

@@ -1,6 +1,6 @@
 { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
-, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick
-, pkgconfig, libiconv }:
+, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrNull, imagemagick
+, pkgconfig}:
 
 let
 
@@ -33,7 +33,7 @@ in
     NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv;
   };
 
-  iconv = { buildInputs = [ libiconvOrEmpty ]; };
+  iconv = { buildInputs = [ libiconvOrNull ]; };
 
   libv8 = {
     # This fix is needed to fool scons, which clears the environment by default.
@@ -83,8 +83,9 @@ in
     buildInputs = [ libxml2 ];
     buildFlags =
       [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
-        "--with-xslt-dir=${libxslt} --with-iconv-dir=${libiconv} --use-system-libraries"
-      ];
+        "--with-xslt-dir=${libxslt} --use-system-libraries"
+      ] ++ stdenv.lib.optional (libiconvOrNull != null) "--with-iconv-dir=${libiconvOrNull}"
+    ;
   };
 
   pry = { gemFlags = "--no-ri --no-rdoc"; };

pkgs/development/libraries/libiconv/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libiconv-1.13.1";
+  name = "libiconv-1.14";
 
   src = fetchurl {
     url = "mirror://gnu/libiconv/${name}.tar.gz";
-    sha256 = "0jcsjk2g28bq20yh7rvbn8xgq6q42g8dkkac0nfh12b061l638sm";
+    sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj";
   };
 
   # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL

pkgs/development/libraries/p11-kit/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
+{ stdenv, fetchurl, libiconvOrNull, pkgconfig, libffi, libtasn1 }:
 
 stdenv.mkDerivation rec {
   name = "p11-kit-0.20.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--without-libtasn1";
 
-  buildInputs = [ libiconv pkgconfig libffi libtasn1 ];
+  buildInputs = [ libiconvOrNull pkgconfig libffi libtasn1 ];
 
   meta = {
     homepage = http://p11-glue.freedesktop.org/;

pkgs/development/ocaml-modules/ocaml-text/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}:
+{stdenv, fetchurl, libiconvOrNull, ocaml, findlib, ncurses}:
 
 stdenv.mkDerivation {
   name = "ocaml-text-0.6";
@@ -8,19 +8,19 @@ stdenv.mkDerivation {
     sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g";
   };
 
-  buildInputs = [ocaml findlib libiconv ncurses];
+  buildInputs = [ocaml findlib libiconvOrNull ncurses];
 
-  configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure";
+  configurePhase =
+    (stdenv.lib.optionalString (libiconvOrNull != null) "iconv_prefix=${libiconvOrNull} ")
+    + "ocaml setup.ml -configure";
 
   createFindlibDestdir = true;
 
 
   meta = {
     homepage = "http://ocaml-text.forge.ocamlcore.org/";
     description = "OCaml-Text is a library for dealing with ``text'', i.e. sequence of unicode characters, in a convenient way. ";
-    license = "BSD";
+    license = stdenv.lib.licenses.bsd3;
     platforms = ocaml.meta.platforms;
-    maintainers = [
-    ];
   };
 }

pkgs/tools/filesystems/netatalk/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:
+{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconvOrNull, pam, openssl }:
 
 stdenv.mkDerivation rec {
   name = "netatalk-3.1.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
   };
 
-  buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl ];
+  buildInputs = [ pkgconfig db libgcrypt avahi libiconvOrNull pam openssl ];
 
   configureFlags = [
     "--with-bdb=${db}"

pkgs/tools/misc/mdbtools/git.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig,
-  libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils,
+  libiconvOrNull, autoconf, automake, libtool, which, txt2man, gnome_doc_utils,
   scrollkeeper}:
 
 stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     name = "mdbtools-git-export";
   };
 
-  buildInputs = [glib readline bison flex pkgconfig libiconv autoconf automake
+  buildInputs = [glib readline bison flex pkgconfig libiconvOrNull autoconf automake
     libtool which txt2man gnome_doc_utils scrollkeeper ];
 
   preConfigure = ''

pkgs/tools/security/clamav/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }:
+{ stdenv, fetchurl, zlib, bzip2, libiconvOrNull, libxml2, openssl, ncurses, curl }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
   version = "0.98.4";
@@ -8,12 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k";
   };
 
-  buildInputs = [ zlib bzip2 libiconv libxml2 openssl ncurses curl ];
+  buildInputs = [ zlib bzip2 libiconvOrNull libxml2 openssl ncurses curl ];
 
   configureFlags = [
     "--with-zlib=${zlib}"
     "--with-libbz2-prefix=${bzip2}"
-    "--with-iconv-dir=${libiconv}"
+  ] ++ (stdenv.lib.optional (libiconvOrNull != null)
+       "--with-iconv-dir=${libiconvOrNull}")
+  ++ [
     "--with-xml=${libxml2}"
     "--with-openssl=${openssl}"
     "--with-libncurses-prefix=${ncurses}"