public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115296 from samueldr/ruby/fix-cross-target

Browse Source 
ruby: Use appropriate targetPlatform
This commit is contained in:
John Ericson 2021-03-12 14:10:33 -05:00 committed by GitHub
commit 7ba904b85e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/ruby/default.nix
View File

@ -50,7 +50,7 @@ let
# - If you run: # - If you run:
# ruby -e "puts RbConfig::CONFIG['configure_args']" # ruby -e "puts RbConfig::CONFIG['configure_args']"
# - In: # - In:
# $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb # $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
# Or (usually): # Or (usually):
# $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb # $(nix-build -A ruby)/lib/ruby/2.6.0/x86_64-linux/rbconfig.rb
# - In $out/lib/libruby.so and/or $out/lib/libruby.dylib # - In $out/lib/libruby.so and/or $out/lib/libruby.dylib
@ -175,7 +175,7 @@ let
$out/lib/libruby* $out/lib/libruby*
${removeReferencesTo}/bin/remove-references-to \ ${removeReferencesTo}/bin/remove-references-to \
-t ${stdenv.cc} \ -t ${stdenv.cc} \
$out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb
'' ''
} }
# Bundler tries to create this directory # Bundler tries to create this directory
@ -187,7 +187,7 @@ let
addRubyLibPath() { addRubyLibPath() {
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir} addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}
addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.targetPlatform.system} addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system}
} }
addEnvHooks "$hostOffset" addGemPath addEnvHooks "$hostOffset" addGemPath