darwin: add libobjc to buildInputs of pkgs.bundlerEnv

pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix

@@ -70,7 +70,6 @@ in
       "--with-exslt-lib=${libxslt}/lib"
       "--with-exslt-include=${libxslt}/include"
     ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
-    buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
   };
 
   pg = attrs: {
@@ -124,10 +123,6 @@ in
     '';
   };
 
-  unf_ext = attrs: {
-    buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
-  };
-
   xapian-ruby = attrs: {
     # use the system xapian
     buildInputs = [ xapian pkgconfig zlib ];

pkgs/development/interpreters/ruby/bundler-env/default.nix

@@ -1,6 +1,6 @@
 { stdenv, runCommand, writeText, writeScript, writeScriptBin, ruby, lib
 , callPackage, defaultGemConfig, fetchurl, fetchgit, buildRubyGem , bundler_HEAD
-, git
+, git, darwin
 }@defs:
 
 # This is a work-in-progress.
@@ -38,10 +38,15 @@ let
       src = (fetchers."${attrs.source.type}" attrs);
     };
 
-  applyGemConfigs = attrs:
-    if gemConfig ? "${attrs.name}"
-    then attrs // gemConfig."${attrs.name}" attrs
-    else attrs;
+  applyGemConfigs = oldAttrs:
+    let
+      attrs = {
+        buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
+      } // oldAttrs;
+    in
+      if gemConfig ? "${attrs.name}"
+      then attrs // gemConfig."${attrs.name}" attrs
+      else attrs;
 
   needsPatch = attrs:
     (attrs ? patches) || (attrs ? prePatch) || (attrs ? postPatch);