diff options
author | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-11-14 12:32:51 -0800 |
commit | 6602f49495c94e8533c8b482698bcf570a8d8933 (patch) | |
tree | 07065424002052ed9e726b4feb689697845ff4a7 /pkgs/development/interpreters/ruby | |
parent | e4feccce818416c39c8e86e6f9ac01674ad98c88 (diff) | |
download | nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.gz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.bz2 nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.lz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.xz nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.tar.zst nixlib-6602f49495c94e8533c8b482698bcf570a8d8933.zip |
Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840dad05cd1728481045466811ae8ae8281. This reverts the fallout from reverting the major changes.
Diffstat (limited to 'pkgs/development/interpreters/ruby')
-rw-r--r-- | pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix index b4e04f6ec904..3ae74057a54f 100644 --- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix +++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix @@ -20,7 +20,7 @@ { lib, fetchurl, writeScript, ruby, libxml2, libxslt, python, stdenv, which , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi -, cmake, libssh2, openssl, mysql +, cmake, libssh2, openssl, mysql, darwin }: let @@ -70,6 +70,7 @@ 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: { @@ -119,6 +120,10 @@ in ''; }; + unf_ext = attrs: { + buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; + }; + xapian-ruby = attrs: { # use the system xapian buildInputs = [ xapian pkgconfig zlib ]; |