darwin purity: ruby-2.1.6

This commit is contained in:
Jude Taylor 2015-08-25 17:14:02 -07:00
parent 557fa59042
commit 4e8279b43b
2 changed files with 6 additions and 2 deletions

View File

@ -7,6 +7,7 @@
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
, ruby_2_1_6, autoreconfHook, bison, useRailsExpress ? true
, libiconv, libobjc, libunwind
}:
let
@ -47,7 +48,8 @@ stdenv.mkDerivation rec {
# support is not enabled, so add readline to the build inputs if curses
# support is disabled (if it's enabled, we already have it) and we're
# running on darwin
++ (op (!cursesSupport && stdenv.isDarwin) readline);
++ (op (!cursesSupport && stdenv.isDarwin) readline)
++ (ops stdenv.isDarwin [ libiconv libobjc libunwind ]);
enableParallelBuilding = true;

View File

@ -5146,7 +5146,9 @@ let
ruby_2_1_1 = callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { };
ruby_2_1_2 = callPackage ../development/interpreters/ruby/ruby-2.1.2.nix { };
ruby_2_1_3 = callPackage ../development/interpreters/ruby/ruby-2.1.3.nix { };
ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix { };
ruby_2_1_6 = callPackage ../development/interpreters/ruby/ruby-2.1.6.nix {
inherit (darwin) libobjc libunwind;
};
ruby_2_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix {
inherit (darwin) libobjc libunwind;
};