diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 438aaf7ba547..029e5cf18a59 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/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 }: +, pkgconfig }: let @@ -83,8 +83,8 @@ 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" + ] ++ libiconvOrEmpty; }; pry = { gemFlags = "--no-ri --no-rdoc"; }; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 76f7ed31d00a..9e65e63ffdb8 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,5 +1,7 @@ { fetchurl, stdenv }: +assert (!stdenv.isLinux); + stdenv.mkDerivation rec { name = "libiconv-1.14";