diff options
| -rw-r--r-- | pkgs/development/ruby-modules/bundled-common/functions.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/ruby-modules/bundled-common/functions.nix b/pkgs/development/ruby-modules/bundled-common/functions.nix index a093cc4dc95c..35307a3fbd93 100644 --- a/pkgs/development/ruby-modules/bundled-common/functions.nix +++ b/pkgs/development/ruby-modules/bundled-common/functions.nix @@ -64,7 +64,7 @@ in rec { "${ruby}/bin/ruby" \ "${confFiles}/Gemfile" \ "$out/${ruby.gemPath}" \ - "${bundler}/${ruby.gemPath}" \ + "${bundler}/${ruby.gemPath}/gems/bundler-${bundler.version}" \ ${lib.escapeShellArg binPaths} \ ${lib.escapeShellArg groups} ''; diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index fe8c43f55ed1..add5db56d1d0 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -8,7 +8,7 @@ out = ENV["out"] ruby = ARGV[0] gemfile = ARGV[1] bundle_path = ARGV[2] -bundler_gem_path = ARGV[3] +bundler_path = ARGV[3] paths = ARGV[4].split groups = ARGV[5].split @@ -35,7 +35,7 @@ ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} ENV["BUNDLE_PATH"] = #{bundle_path.dump} ENV['BUNDLE_FROZEN'] = '1' -Gem.use_paths(#{bundler_gem_path.dump}, ENV["GEM_PATH"]) +$LOAD_PATH.unshift #{bundler_path.dump} + "/lib" require 'bundler' Bundler.setup(#{groups.map(&:dump).join(', ')}) |