Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dfff83a14ee0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: deecb4c1aab7
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 28, 2018

  1. terraform: Wrap PATH of propagatedBuildInputs (#37861) 

    Plugins (namely terraform-provider-libvirt) may have a run time
dependency on external binaries.
    @adisbladis @Mic92
    adisbladis authored and Mic92 committed Mar 28, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    deecb4c View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/applications/networking/cluster/terraform/default.nix
6 changes: 5 additions & 1 deletion pkgs/applications/networking/cluster/terraform/default.nix
View file
Original file line number Diff line number Diff line change
@@ -44,6 +44,9 @@ let
let
actualPlugins = plugins terraform.plugins;

# Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries
wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins)));

passthru = {
withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins);

@@ -64,7 +67,8 @@ let
buildCommand = ''
mkdir -p $out/bin/
makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \
--set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin"
--set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \
--prefix PATH : "${lib.makeBinPath wrapperInputs}"
'';

inherit passthru;