diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-06-11 11:01:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 11:01:39 -0500 |
| commit | 6590c338500a8e2939f0fd0bc21e23ab3dd41b91 (patch) | |
| tree | 7cbf20c03319829a0b1e5d7a5a441c1c1f18e3eb /pkgs/development/interpreters | |
| parent | d659f968ba32395c7e2fce3b87b3047c7efd8d03 (diff) | |
| parent | bb8ea1384097210b942bd5333f97794df5a730b4 (diff) | |
| download | nixlib-6590c338500a8e2939f0fd0bc21e23ab3dd41b91.tar nixlib-6590c338500a8e2939f0fd0bc21e23ab3dd41b91.tar.gz nixlib-6590c338500a8e2939f0fd0bc21e23ab3dd41b91.tar.bz2 nixlib-6590c338500a8e2939f0fd0bc21e23ab3dd41b91.tar.lz nixlib-6590c338500a8e2939f0fd0bc21e23ab3dd41b91.tar.xz nixlib-6590c338500a8e2939f0fd0bc21e23ab3dd41b91.tar.zst nixlib-6590c338500a8e2939f0fd0bc21e23ab3dd41b91.zip | |
Merge pull request #89726 from doronbehar/ruby-gcc-ref
rubyMinimal: don't reference stdenv.cc
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 1756c13b53d1..1e6a81373bb5 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -37,6 +37,7 @@ let , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , rubygemsSupport ? true + , JitSupport ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true , gdbm, gdbmSupport ? true @@ -118,6 +119,7 @@ let configureFlags = ["--enable-shared" "--enable-pthread" "--with-soname=ruby_${tag}"] ++ op useRailsExpress "--with-baseruby=${baseruby}/bin/ruby" + ++ op (!JitSupport) "--disable-jit-support" ++ op (!docSupport) "--disable-install-doc" ++ ops stdenv.isDarwin [ # on darwin, we have /usr/include/tk.h -- so the configure script detects @@ -155,6 +157,9 @@ let ${removeReferencesTo}/bin/remove-references-to \ -t ${stdenv.cc} \ $out/lib/libruby* + ${removeReferencesTo}/bin/remove-references-to \ + -t ${stdenv.cc} \ + $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb '' } # Bundler tries to create this directory |