mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 04:43:09 +03:00
nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux
This commit is contained in:
parent
8bf10bfc26
commit
d562934ee7
@ -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"; };
|
||||
|
@ -1,5 +1,7 @@
|
||||
{ fetchurl, stdenv }:
|
||||
|
||||
assert (!stdenv.isLinux);
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libiconv-1.14";
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user