public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux

Browse Source
This commit is contained in:
Domen Kožar 2014-11-22 21:13:13 +01:00
parent 8bf10bfc26
commit d562934ee7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/ruby/patches.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi
, zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick , zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick
, pkgconfig, libiconv }: , pkgconfig }:
let let
@ -83,8 +83,8 @@ in
buildInputs = [ libxml2 ]; buildInputs = [ libxml2 ];
buildFlags = buildFlags =
[ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" [ "--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"; }; pry = { gemFlags = "--no-ri --no-rdoc"; };

2
pkgs/development/libraries/libiconv/default.nix
View File

@ -1,5 +1,7 @@
{ fetchurl, stdenv }: { fetchurl, stdenv }:
assert (!stdenv.isLinux);
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libiconv-1.14"; name = "libiconv-1.14";