diff options
author | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:42:23 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-10-02 12:42:23 -0700 |
commit | f61176c5396ed513f3d399f73f38ab78a066667f (patch) | |
tree | 80b19d8098b5a1d93c8bca057438b5d0ed35f704 /pkgs/development/interpreters | |
parent | a27ca029ee2b39e04d7d2a516a7228f4b62067fb (diff) | |
parent | 2ef6508c7f187e1b8433f9936b98b79bee6ed31c (diff) | |
download | nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.gz nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.bz2 nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.lz nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.xz nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.tar.zst nixlib-f61176c5396ed513f3d399f73f38ab78a066667f.zip |
Merge pull request #9543 from NixOS/staging.post-15.06
Collection of core package updates with breaking changes
Diffstat (limited to 'pkgs/development/interpreters')
-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 ]; |