diff options
| author | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-28 14:29:52 -0500 |
|---|---|---|
| committer | Charles Strahan <charles.c.strahan@gmail.com> | 2014-12-28 14:29:52 -0500 |
| commit | 145733c479f5e17ef8c8efdd61001fd62940f8a5 (patch) | |
| tree | 5c231051071eb0661ba6903db086910a4c6aa32d /pkgs/applications/version-management/redmine | |
| parent | 4ed847d81d1e10da91d5f8bae2f92e7af32dbe80 (diff) | |
| parent | a30869a525bd05cefb73bd731db6b9ed12e56c6c (diff) | |
| download | nixlib-145733c479f5e17ef8c8efdd61001fd62940f8a5.tar nixlib-145733c479f5e17ef8c8efdd61001fd62940f8a5.tar.gz nixlib-145733c479f5e17ef8c8efdd61001fd62940f8a5.tar.bz2 nixlib-145733c479f5e17ef8c8efdd61001fd62940f8a5.tar.lz nixlib-145733c479f5e17ef8c8efdd61001fd62940f8a5.tar.xz nixlib-145733c479f5e17ef8c8efdd61001fd62940f8a5.tar.zst nixlib-145733c479f5e17ef8c8efdd61001fd62940f8a5.zip | |
Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby
Conflicts: pkgs/applications/version-management/redmine/default.nix pkgs/development/interpreters/ruby/gem.nix pkgs/development/interpreters/ruby/generated.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/tools/vagrant/default.nix pkgs/servers/consul/default.nix
Diffstat (limited to 'pkgs/applications/version-management/redmine')
| -rw-r--r-- | pkgs/applications/version-management/redmine/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 22fe6ba5be02..ea3a07db724a 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, rubyPackages, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: +{ stdenv, fetchurl, ruby, rubyPackages, 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 rubyPackages.bundler libiconv libxslt libxml2 pkgconfig libffi + ruby rubyPackages.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 \ |