alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

redmine: use libc libciconv implementation on Linux.

Browse source
This commit is contained in:
Massimo Zaniboni 2014-12-12 01:20:53 +01:00
parent d83bae657a
commit 32f9644943
1 changed files with 5 additions and 3 deletions

8
pkgs/applications/version-management/redmine/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: { stdenv, fetchurl, ruby, rubyLibs, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }:
let let
gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix);
@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
''; '';
buildInputs = [ buildInputs = [
ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig libffi ruby rubyLibs.bundler
] ++ (if (libiconvOrNull != null) then [libiconv] else []) ++ [
libxslt libxml2 pkgconfig libffi
imagemagickBig postgresql imagemagickBig postgresql
]; ];
@ -46,7 +48,7 @@ in stdenv.mkDerivation rec {
bundle config build.nokogiri \ bundle config build.nokogiri \
--use-system-libraries \ --use-system-libraries \
--with-iconv-dir=${libiconv} \ --with-iconv-dir=${libiconvOrLibc} \
--with-xslt-dir=${libxslt} \ --with-xslt-dir=${libxslt} \
--with-xml2-dir=${libxml2} \ --with-xml2-dir=${libxml2} \
--with-pkg-config \ --with-pkg-config \