swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

vagrant: Remove unnecessary buildInputs

Browse source 
libvirt and pkgconfig are now buildInputs to ruby-libvirt instead.
This commit is contained in:
Matthew Harm Bekkema 2018-12-17 14:13:24 +11:00
parent 245ba973d9
commit c660f3d419
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/tools/vagrant/default.nix
View file

@ -1,4 +1,4 @@
{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true, libvirt, pkgconfig }:
{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive, writeText, withLibvirt ? true}:
let
# NOTE: bumping the version and updating the hash is insufficient;
@ -35,8 +35,6 @@ in buildRubyGem rec {
dontBuild = false;
src = fetchurl { inherit url sha256; };
buildInputs = lib.optional withLibvirt [ libvirt pkgconfig ];
patches = [
./unofficial-installation-nowarn.patch
./use-system-bundler-version.patch
@ -53,12 +51,7 @@ in buildRubyGem rec {
postInstall = ''
wrapProgram "$out/bin/vagrant" \
--set GEM_PATH "${deps}/lib/ruby/gems/${ruby.version.libDir}" \
--prefix PATH ':' "${lib.getBin libarchive}/bin" \
${lib.optionalString withLibvirt ''
--prefix PATH ':' "${pkgconfig}/bin" \
--prefix PKG_CONFIG_PATH ':' \
"${lib.makeSearchPath "lib/pkgconfig" [ libvirt ]}"
''}
--prefix PATH ':' "${lib.getBin libarchive}/bin"
mkdir -p "$out/vagrant-plugins/plugins.d"
echo '{}' > "$out/vagrant-plugins/plugins.json"