modernize rubies

This commit is contained in:
Jude Taylor
2015-07-10 10:28:27 -07:00
parent f72beea75e
commit 7393c6c69d
3 changed files with 9 additions and 3 deletions
@@ -7,6 +7,7 @@
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
, ruby_2_2_0, 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;
@@ -7,6 +7,7 @@
, libyaml, yamlSupport ? true
, libffi, fiddleSupport ? true
, ruby_2_2_2, 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;