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

Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby

Browse Source 
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
This commit is contained in:
Charles Strahan
2014-12-28 14:29:52 -05:00
parent 4ed847d81d a30869a525
commit 145733c479
3039 changed files with 76778 additions and 42039 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/redmine/default.nix
+5 -3
View File
@@ -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 \