diff options
author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
---|---|---|
committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/tools | |
parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) |
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
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/filesystems/netatalk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/aescrypt/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/mdbtools/git.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/disnix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/clamav/default.nix | 12 | ||||
-rw-r--r-- | pkgs/tools/security/gnupg/20.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/security/opensc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/enca/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/gnugrep/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/typesetting/docbook2x/default.nix | 6 |
10 files changed, 26 insertions, 29 deletions
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 61afe6ffb90cc..d5a0cbbc4190a 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconvOrEmpty, pam, openssl }: +{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }: stdenv.mkDerivation rec { name = "netatalk-3.1.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq"; }; - buildInputs = [ pkgconfig db libgcrypt avahi pam openssl ] ++ libiconvOrEmpty; + buildInputs = [ pkgconfig db libgcrypt avahi pam openssl libiconv ]; configureFlags = [ "--with-bdb=${db}" diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index f39e466c78f93..ba58bd86a747e 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconvOrEmpty }: +{ stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { version = "3.0.9"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cp aescrypt_keygen $out/bin ''; - buildInputs = [ libiconvOrEmpty ]; + buildInputs = [ libiconv ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv"; diff --git a/pkgs/tools/misc/mdbtools/git.nix b/pkgs/tools/misc/mdbtools/git.nix index 9262c6e8eb852..8cf5e5e9a38d6 100644 --- a/pkgs/tools/misc/mdbtools/git.nix +++ b/pkgs/tools/misc/mdbtools/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, glib, readline, bison, flex, pkgconfig, - libiconvOrEmpty, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, + libiconv, autoconf, automake, libtool, which, txt2man, gnome_doc_utils, scrollkeeper}: stdenv.mkDerivation { @@ -13,8 +13,8 @@ stdenv.mkDerivation { buildInputs = [ glib readline bison flex pkgconfig autoconf automake - libtool which txt2man gnome_doc_utils scrollkeeper - ] ++ libiconvOrEmpty; + libtool which txt2man gnome_doc_utils scrollkeeper libiconv + ]; preConfigure = '' sed -e 's@static \(GHashTable [*]mdb_backends;\)@\1@' -i src/libmdb/backend.c diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 19eef437ad755..b4d80e10b6425 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconvOrEmpty }: +{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { name = "disnix-0.3prea0484a2c19d1947c21f11b4fc7c3f6049bd11efa"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "06qjaxysnkm31rgjlqy9n7p59q5v3jl57jm9jya7zf2g90syhdn7"; }; - buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconvOrEmpty dysnomia ]; + buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; dontStrip = true; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 11e08d502ed98..350a6f369f0d0 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, libiconvOrNull, libxml2, openssl, ncurses, curl }: +{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }: stdenv.mkDerivation rec { name = "clamav-${version}"; version = "0.98.6"; @@ -8,20 +8,18 @@ stdenv.mkDerivation rec { sha256 = "0l99a0shgzpl8rvrrgbm1ki2zxlb7g1n82bhq7f2snj4amfj94b5"; }; - buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl ] - ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull; + buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv ]; configureFlags = [ "--with-zlib=${zlib}" "--with-libbz2-prefix=${bzip2}" - ] ++ (stdenv.lib.optional (libiconvOrNull != null) - "--with-iconv-dir=${libiconvOrNull}") - ++ [ + "--with-iconv-dir=${libiconv}" "--with-xml=${libxml2}" "--with-openssl=${openssl}" "--with-libncurses-prefix=${ncurses}" "--with-libcurl=${curl}" - "--disable-clamav" ]; + "--disable-clamav" + ]; meta = with stdenv.lib; { homepage = http://www.clamav.net; diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index a584f2d1d853d..0fcf334bee0b7 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, readline, zlib, libgpgerror, pth, libgcrypt, libassuan -, libksba, coreutils, libiconvOrEmpty +, libksba, coreutils, libiconv # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, openldap ? null, bzip2 ? null, libusb ? null, curl ? null @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth - openldap bzip2 libusb curl ] - ++ libiconvOrEmpty; + openldap bzip2 libusb curl libiconv ]; patchPhase = '' find tests -type f | xargs sed -e 's@/bin/pwd@${coreutils}&@g' -i diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 42303fc356aae..31ad1108ddad2 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconvOrNull, pcsclite +{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite , libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig - libXt libxslt libiconvOrNull docbook_xml_dtd_412 + libXt libxslt libiconv docbook_xml_dtd_412 ]; configureFlags = [ diff --git a/pkgs/tools/text/enca/default.nix b/pkgs/tools/text/enca/default.nix index 043f7cf5a12b7..363446d409bd2 100644 --- a/pkgs/tools/text/enca/default.nix +++ b/pkgs/tools/text/enca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconvOrNull, recode }: +{ stdenv, fetchurl, libiconv, recode }: stdenv.mkDerivation rec { name = "enca-1.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0hg7ggldam66l9j53nlrvi2lv1k99r2qfk6dh23vg6mi05cph7bw"; }; - buildInputs = [ recode libiconvOrNull ]; + buildInputs = [ recode libiconv ]; meta = { homepage = http://freecode.com/projects/enca; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 8be986e0cbb7c..522a1a05ce927 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pcre, libiconvOrNull }: +{ stdenv, fetchurl, pcre, libiconv }: let version = "2.20"; in @@ -10,9 +10,9 @@ stdenv.mkDerivation { sha256 = "0rcs0spsxdmh6yz8y4frkqp6f5iw19mdbdl9s2v6956hq0mlbbzh"; }; - buildInputs = [ pcre libiconvOrNull ]; + buildInputs = [ pcre libiconv ]; - NIX_LDFLAGS = stdenv.lib.optionalString (libiconvOrNull != null) "-L${libiconvOrNull}/lib -liconv"; + NIX_LDFLAGS = "-L${libiconv}/lib -liconv"; doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index b31c64e6936a3..37cd6a2e50b3a 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, texinfo, perl , XMLSAX, XMLParser, XMLNamespaceSupport -, groff, libxml2, libxslt, gnused, libiconvOrEmpty, opensp +, groff, libxml2, libxslt, gnused, libiconv, opensp , docbook_xml_dtd_43 , makeWrapper }: @@ -17,8 +17,8 @@ stdenv.mkDerivation rec { patches = [ ./db2x_texixml-to-stdout.patch ]; buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper - XMLSAX XMLParser XMLNamespaceSupport opensp - ] ++ libiconvOrEmpty; + XMLSAX XMLParser XMLNamespaceSupport opensp libiconv + ]; postConfigure = '' # Broken substitution is used for `perl/config.pl', which leaves literal |