diff options
| author | Domen Kožar <domen@dev.si> | 2014-11-22 21:13:13 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-11-22 21:13:22 +0100 |
| commit | d562934ee7eb8df8fd9c9c6c4c5527045427411f (patch) | |
| tree | 0b5a8548fb3b63f2322d791466c077dc7c3774f3 /pkgs/development/interpreters | |
| parent | 8bf10bfc26dd304837767cb9676d0b4ae676967f (diff) | |
| download | nixlib-d562934ee7eb8df8fd9c9c6c4c5527045427411f.tar nixlib-d562934ee7eb8df8fd9c9c6c4c5527045427411f.tar.gz nixlib-d562934ee7eb8df8fd9c9c6c4c5527045427411f.tar.bz2 nixlib-d562934ee7eb8df8fd9c9c6c4c5527045427411f.tar.lz nixlib-d562934ee7eb8df8fd9c9c6c4c5527045427411f.tar.xz nixlib-d562934ee7eb8df8fd9c9c6c4c5527045427411f.tar.zst nixlib-d562934ee7eb8df8fd9c9c6c4c5527045427411f.zip | |
nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/ruby/patches.nix | 6 |
1 files changed, 3 insertions, 3 deletions
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"; }; |