diff options
| author | Jude Taylor <me@jude.bio> | 2016-01-24 22:48:14 -0800 |
|---|---|---|
| committer | Jude Taylor <me@jude.bio> | 2016-01-24 22:48:14 -0800 |
| commit | c473bea69a93c22ab3215156433a14f563626839 (patch) | |
| tree | ea500e61c7672ebb625b29e16bd05f440cf57104 | |
| parent | scanbd: init at 1.4.4 (diff) | |
| parent | buildRubyGem: fix missing libobjc in darwin (diff) | |
| download | nixpkgs-c473bea69a93c22ab3215156433a14f563626839.tar.gz | |
Merge pull request #12603 from zimbatm/ruby-fixes
Ruby fixes
3 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix index d050faca2454..c5b9fba37aa0 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix @@ -18,7 +18,8 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, buildRubyGem +{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, + buildRubyGem, darwin } @ defs: lib.makeOverridable ( @@ -85,6 +86,7 @@ stdenv.mkDerivation (attrs // { buildInputs = [ ruby rubygems makeWrapper ] ++ lib.optionals (type == "git") [ git bundler ] + ++ lib.optional stdenv.isDarwin darwin.libobjc ++ buildInputs; name = attrs.name or (namePrefix + gemName); diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb index 647b83b52c38..48ab5270c22f 100644 --- a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb +++ b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb @@ -107,7 +107,6 @@ if spec.executables.any? spec.executables.each do |exe| wrapper = File.join(bin_dir, exe) File.open(wrapper, "w") do |f| - stub = generate_stub(spec.name, exe) f.write(<<-EOF) #!#{ruby} # diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix index ae8c0ee6e6ad..787c3be54e35 100644 --- a/pkgs/development/interpreters/ruby/gemconfig/default.nix +++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix @@ -79,7 +79,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; }; patron = attrs: { @@ -143,10 +142,6 @@ in ''; }; - unf_ext = attrs: { - buildInputs = lib.optional stdenv.isDarwin darwin.libobjc; - }; - xapian-ruby = attrs: { # use the system xapian dontBuild = false; |