From 2ed25d3768b78faf1f6b90f5adb5e62ef15f75ff Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Mon, 27 Aug 2018 22:57:19 -0700 Subject: vagrant: mark bundler as system plugin This will cause Vagrant to use the rubygems version of bundler without complaint. --- pkgs/development/tools/vagrant/default.nix | 1 + .../tools/vagrant/use-system-bundler-version.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 pkgs/development/tools/vagrant/use-system-bundler-version.patch (limited to 'pkgs/development/tools/vagrant') diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index fe75c9fd208..f247a20b1b2 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -38,6 +38,7 @@ in buildRubyGem rec { patches = [ ./unofficial-installation-nowarn.patch + ./use-system-bundler-version.patch ]; # PATH additions: diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/development/tools/vagrant/use-system-bundler-version.patch new file mode 100644 index 00000000000..c386acf4a1c --- /dev/null +++ b/pkgs/development/tools/vagrant/use-system-bundler-version.patch @@ -0,0 +1,13 @@ +diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb +index 301e40e37..e361ab510 100644 +--- i/lib/vagrant/bundler.rb ++++ w/lib/vagrant/bundler.rb +@@ -217,7 +217,7 @@ module Vagrant + source_list = {} + system_plugins = plugins.map do |plugin_name, plugin_info| + plugin_name if plugin_info["system"] +- end.compact ++ end.compact << "bundler" + installer_set = VagrantSet.new(:both) + installer_set.system_plugins = system_plugins + -- cgit 1.4.1