From 7393c6c69d32ba844f2bf9bb88530ac3eb99a968 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Thu, 9 Jul 2015 15:42:47 -0700 Subject: [PATCH] modernize rubies --- pkgs/development/interpreters/ruby/ruby-2.2.0.nix | 4 +++- pkgs/development/interpreters/ruby/ruby-2.2.2.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix index b6375aa687d..e22e64681a3 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.2.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.2.0.nix @@ -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; diff --git a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix index 5537d0e8c80..d75c21fa0b1 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.2.2.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.2.2.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29262aee6ab..2736481473e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;