diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-03-13 00:38:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-13 00:38:26 +0000 |
| commit | b0a6c2b8a596aa3da72d003cd3a5e6556eff9072 (patch) | |
| tree | e9d992a756aba0203b1e94b8ebc34f7116db17a5 /pkgs/development/interpreters/ruby | |
| parent | f747bcb8687791bd3eedeb0b7f0e679e34c79f9c (diff) | |
| parent | d70c7d2388f830f2d2411423a06ea75d15b6b294 (diff) | |
| download | nixpkgs-b0a6c2b8a596aa3da72d003cd3a5e6556eff9072.tar nixpkgs-b0a6c2b8a596aa3da72d003cd3a5e6556eff9072.tar.gz nixpkgs-b0a6c2b8a596aa3da72d003cd3a5e6556eff9072.tar.bz2 nixpkgs-b0a6c2b8a596aa3da72d003cd3a5e6556eff9072.tar.lz nixpkgs-b0a6c2b8a596aa3da72d003cd3a5e6556eff9072.tar.xz nixpkgs-b0a6c2b8a596aa3da72d003cd3a5e6556eff9072.tar.zst nixpkgs-b0a6c2b8a596aa3da72d003cd3a5e6556eff9072.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters/ruby')
| -rw-r--r-- | pkgs/development/interpreters/ruby/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index d53edaad03e..b13c50f18d2 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -51,7 +51,7 @@ let # - If you run: # ruby -e "puts RbConfig::CONFIG['configure_args']" # - In: - # $out/${passthru.libPath}/${stdenv.targetPlatform.system}/rbconfig.rb + # $out/${passthru.libPath}/${stdenv.hostPlatform.system}/rbconfig.rb # Or (usually): # $(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 @@ -177,7 +177,7 @@ let $out/lib/libruby* ${removeReferencesTo}/bin/remove-references-to \ -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 @@ -189,7 +189,7 @@ let addRubyLibPath() { 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}/${stdenv.targetPlatform.system} + addToSearchPath RUBYLIB \$1/lib/ruby/site_ruby/${ver.libDir}/${stdenv.hostPlatform.system} } addEnvHooks "$hostOffset" addGemPath |