From 4e8279b43b30d119468e8ba76716c1d6bdcf67f5 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Tue, 25 Aug 2015 17:14:02 -0700 Subject: [PATCH] darwin purity: ruby-2.1.6 --- pkgs/development/interpreters/ruby/ruby-2.1.6.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix index c9016a338af2..b4600f5c9aff 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.6.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.6.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 017601a3a4d1..d6737cbc4ddc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };