mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 21:09:00 +02:00
vagrant: Remove unnecessary buildInputs
libvirt and pkgconfig are now buildInputs to ruby-libvirt instead.
This commit is contained in:
parent
245ba973d9
commit
c660f3d419
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue