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/development | |
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/development')
-rw-r--r-- | pkgs/development/compilers/vala/0.26.nix | 5 | ||||
-rw-r--r-- | pkgs/development/compilers/vala/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/interpreters/ruby/patches.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/apr-util/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/avahi/default.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/dbus-glib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/glib/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libgsf/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libtorrent-rasterbar/generic.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/p11-kit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/poppler/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/stfl/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/ocaml-text/default.nix | 9 | ||||
-rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 4 |
15 files changed, 34 insertions, 41 deletions
diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix index 48b5476fe1d0f..4cc07eb7d9d7b 100644 --- a/pkgs/development/compilers/vala/0.26.nix +++ b/pkgs/development/compilers/vala/0.26.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconvOrEmpty, libintlOrEmpty +, glib, libiconv, libintlOrEmpty }: let @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - buildInputs = [ glib ] - ++ libiconvOrEmpty + buildInputs = [ glib libiconv ] ++ libintlOrEmpty; } diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 38c3ead7bff21..13b9c5f398320 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconvOrEmpty, libintlOrEmpty +, glib, libiconv, libintlOrEmpty }: let @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - buildInputs = [ glib ] - ++ libiconvOrEmpty + buildInputs = [ glib libiconv ] ++ libintlOrEmpty; } diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 029e5cf18a592..5a2c206fad526 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,5 +1,5 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi -, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick +, zlib, libuuid, gems, jdk, python, stdenv, libiconv, imagemagick , pkgconfig }: let @@ -33,7 +33,7 @@ in NIX_POST_EXTRACT_FILES_HOOK = patchUsrBinEnv; }; - iconv = { buildInputs = [ libiconvOrEmpty ]; }; + iconv = { buildInputs = [ libiconv ]; }; libv8 = { # This fix is needed to fool scons, which clears the environment by default. diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 76477d38b6d5a..0f21af94c64c9 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -2,7 +2,7 @@ , sslSupport ? true, openssl , bdbSupport ? false, db , ldapSupport ? true, openldap -, libiconvOrNull +, libiconv }: assert sslSupport -> openssl != null; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString ldapSupport "--with-ldap"} ''; - propagatedBuildInputs = [ makeWrapper apr expat libiconvOrNull ] + propagatedBuildInputs = [ makeWrapper apr expat libiconv ] ++ optional sslSupport openssl ++ optional bdbSupport db ++ optional ldapSupport openldap; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index 0adc7d56357e4..6c8fe6e112b75 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libdaemon, dbus, perl, perlXMLParser -, expat, gettext, intltool, glib, libiconvOrEmpty +, expat, gettext, intltool, glib, libiconv , qt4 ? null , qt4Support ? false , withLibdnssdCompat ? false }: @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { patches = [ ./no-mkdir-localstatedir.patch ]; - buildInputs = [ libdaemon dbus perl perlXMLParser glib expat ] - ++ (stdenv.lib.optional qt4Support qt4) - ++ libiconvOrEmpty; + buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ] + ++ (stdenv.lib.optional qt4Support qt4); nativeBuildInputs = [ pkgconfig gettext intltool ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 97e455b1f30e9..e38d996766afc 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconvOrEmpty, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconv, libintlOrEmpty , expat, zlib, libpng, pixman, fontconfig, freetype, xlibs , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "0mk2fd9fwxqzravlmnbbrzwak15wqspn7609y0yn6qh87va5i0x4"; })]; - nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty; + nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; propagatedBuildInputs = with xlibs; [ xlibs.xlibs fontconfig expat freetype pixman zlib libpng ] diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index 80afcb343ddd1..16a20ec94a4d1 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconvOrEmpty, dbus, glib }: +{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: stdenv.mkDerivation rec { name = "dbus-glib-0.102"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ expat ] ++ libiconvOrEmpty; + buildInputs = [ expat libiconv ]; propagatedBuildInputs = [ dbus.libs glib ]; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 714b8073ee040..1dff672b3489f 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, python -, libiconvOrEmpty, libintlOrEmpty, zlib, libffi, pcre, libelf +, libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf # this is just for tests (not in closure of any regular package) , coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false @@ -60,8 +60,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext perl python ]; - propagatedBuildInputs = [ pcre zlib libffi ] - ++ optional (!stdenv.isDarwin) libiconvOrEmpty + propagatedBuildInputs = [ pcre zlib libffi libiconv ] ++ libintlOrEmpty; configureFlags = diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index dbcdabc895106..0479343a8f555 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, gdk_pixbuf, libiconvOrEmpty, libintlOrEmpty }: +, python, gdk_pixbuf, libiconv, libintlOrEmpty }: with { inherit (stdenv.lib) optionals; }; @@ -15,8 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext bzip2 zlib python ]; - propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] - ++ libiconvOrEmpty + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ] ++ libintlOrEmpty; doCheck = true; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index f47ff1081bc8e..b866f66dbfa26 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconvOrNull, geoip +{ stdenv, fetchurl, boost, openssl, pkgconfig, zlib, python, libiconv, geoip # Version specific options , version, sha256 , ... }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - buildInputs = [ boost pkgconfig openssl zlib python libiconvOrNull geoip ]; + buildInputs = [ boost pkgconfig openssl zlib python libiconv geoip ]; configureFlags = [ "--enable-python-binding" @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { "--with-libiconv=yes" "--with-boost=${boost.dev}" "--with-boost-libdir=${boost.lib}/lib" - ] ++ stdenv.lib.optional (libiconvOrNull != null) "--with-libiconv=yes"; + "--with-libiconv=yes" + ]; meta = with stdenv.lib; { homepage = http://www.rasterbar.com/products/libtorrent/; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index d1778093868cb..0ecbc109d39d3 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libiconvOrEmpty, pkgconfig, libffi, libtasn1 }: +{ stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }: stdenv.mkDerivation rec { name = "p11-kit-0.20.2"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = "--without-libtasn1"; - buildInputs = [ pkgconfig libffi libtasn1 ] ++ libiconvOrEmpty; + buildInputs = [ pkgconfig libffi libtasn1 libiconv ]; meta = { homepage = http://p11-glue.freedesktop.org/; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 76a45a0ecc80b..08c85931204a2 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconv, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , qt4Support ? false, qt4 ? null, qt5 }: @@ -26,7 +26,7 @@ let propagatedBuildInputs = [ zlib cairo freetype fontconfig libjpeg lcms curl openjpeg ]; - nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty ++ libintlOrEmpty; + nativeBuildInputs = [ pkgconfig cmake libiconv ] ++ libintlOrEmpty; cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON"; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 9e3f749ca8f47..4e24268314e83 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, libiconvOrEmpty }: +{ stdenv, fetchurl, ncurses, libiconv }: stdenv.mkDerivation rec { name = "stfl-0.22"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d"; }; - buildInputs = [ ncurses ] ++ libiconvOrEmpty; + buildInputs = [ ncurses libiconv ]; buildPhase = '' sed -i s%ncursesw/ncurses.h%ncurses.h% stfl_internals.h diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 387c5cef19adb..44b30b368b325 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libiconvOrNull, ocaml, findlib, ncurses}: +{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}: stdenv.mkDerivation { name = "ocaml-text-0.6"; @@ -8,12 +8,9 @@ stdenv.mkDerivation { sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g"; }; - buildInputs = [ocaml findlib ncurses] - ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull; + buildInputs = [ocaml findlib ncurses libiconv]; - configurePhase = - (stdenv.lib.optionalString (libiconvOrNull != null) "iconv_prefix=${libiconvOrNull} ") - + "ocaml setup.ml -configure"; + configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure"; createFindlibDestdir = true; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 1d9247604ae31..6a5359b8147b0 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconvOrLibc +{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv , libxml2, libxslt }: assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { # libiconv: iconv rm opt/vagrant/embedded/bin/iconv - ln -s ${libiconvOrLibc}/bin/iconv opt/vagrant/embedded/bin + ln -s ${libiconv}/bin/iconv opt/vagrant/embedded/bin # libxml: xml2-config, xmlcatalog, xmllint rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint} |