From 32f9644943e8772b33a58a4f7105b3dc7f38723d Mon Sep 17 00:00:00 2001 From: Massimo Zaniboni Date: Fri, 12 Dec 2014 01:20:53 +0100 Subject: [PATCH] redmine: use libc libciconv implementation on Linux. --- pkgs/applications/version-management/redmine/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 4655a16671ee..a4254384e5b8 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -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 gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig libffi + ruby rubyLibs.bundler + ] ++ (if (libiconvOrNull != null) then [libiconv] else []) ++ [ + libxslt libxml2 pkgconfig libffi imagemagickBig postgresql ]; @@ -46,7 +48,7 @@ in stdenv.mkDerivation rec { bundle config build.nokogiri \ --use-system-libraries \ - --with-iconv-dir=${libiconv} \ + --with-iconv-dir=${libiconvOrLibc} \ --with-xslt-dir=${libxslt} \ --with-xml2-dir=${libxml2} \ --with-pkg-config \