diff options
| -rw-r--r-- | pkgs/development/interpreters/ruby/ruby-1.9.3.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix index c53a012d753..f0da9173bac 100644 --- a/pkgs/development/interpreters/ruby/ruby-1.9.3.nix +++ b/pkgs/development/interpreters/ruby/ruby-1.9.3.nix @@ -6,6 +6,7 @@ , groff, docSupport ? false , libyaml, yamlSupport ? true , ruby_1_9_3, autoreconfHook, bison, useRailsExpress ? true +, libiconv, libobjc }: let @@ -44,7 +45,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 ]); enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6df02e2aa89..4a7384b587b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4965,7 +4965,9 @@ let bundlerEnv = callPackage ../development/interpreters/ruby/bundler-env { }; ruby_1_8_7 = callPackage ../development/interpreters/ruby/ruby-1.8.7.nix { }; - ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { }; + ruby_1_9_3 = callPackage ../development/interpreters/ruby/ruby-1.9.3.nix { + inherit (darwin) libobjc; + }; ruby_2_0_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.0.0.nix { }); ruby_2_1_0 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.0.nix { }); ruby_2_1_1 = lowPrio (callPackage ../development/interpreters/ruby/ruby-2.1.1.nix { }); |