git.iko.soy/typeable/nixpkgs
on master help sign in
vagrant: Remove unnecessary buildInputs

libvirt and pkgconfig are now buildInputs to ruby-libvirt instead.

commitc660f3d41964fb8da83d1938a58edf8801e0af0d authorMatthew Harm Bekkema <mbekkema97@gmail.com> dateMon 17 Dec 2018, 14:13 (8 years ago) parent245ba97
1 file changed+2−9
pkgs/development/tools/vagrant/default.nix+2−9
pkgs/development/tools/vagrant/default.nix+2−9
@@ -1,4 +1,4 @@
1−{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true, libvirt, pkgconfig }:
1+{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true}:
22
33let
44 # NOTE: bumping the version and updating the hash is insufficient;
@@ -35,8 +35,6 @@ in buildRubyGem rec {
3535 dontBuild = false;
3636 src = fetchurl { inherit url sha256; };
3737
38− buildInputs = lib.optional withLibvirt [ libvirt pkgconfig ];
39−
4038 patches = [
4139 ./unofficial-installation-nowarn.patch
4240 ./use-system-bundler-version.patch
@@ -53,12 +51,7 @@ in buildRubyGem rec {
5351 postInstall = ''
5452 wrapProgram "$out/bin/vagrant" \
5553 --set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \
56− --prefix PATH ':' "${lib.getBin libarchive}/bin" \
57− ${lib.optionalString withLibvirt ''
58− --prefix PATH ':' "${pkgconfig}/bin" \
59− --prefix PKG_CONFIG_PATH ':' \
60− "${lib.makeSearchPath "lib/pkgconfig" [ libvirt ]}"
61− ''}
54+ --prefix PATH ':' "${lib.getBin libarchive}/bin"
6255
6356 mkdir -p "$out/vagrant-plugins/plugins.d"
6457 echo '{}' > "$out/vagrant-plugins/plugins.json"