mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 05:43:50 +03:00
modernize rubies
This commit is contained in:
parent
f72beea75e
commit
7393c6c69d
@ -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;
|
||||
|
||||
|
@ -5047,7 +5047,9 @@ let
|
||||
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_2_0 = callPackage ../development/interpreters/ruby/ruby-2.2.0.nix { };
|
||||
ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix { };
|
||||
ruby_2_2_2 = callPackage ../development/interpreters/ruby/ruby-2.2.2.nix {
|
||||
inherit (darwin) libobjc libunwind;
|
||||
};
|
||||
|
||||
# Ruby aliases
|
||||
ruby = ruby_2_2;
|
||||
|
Loading…
Reference in New Issue
Block a user