summary refs log tree commit diff
path: root/pkgs/applications/networking/cluster
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2018-03-28 08:25:23 +0800
committerJörg Thalheim <Mic92@users.noreply.github.com>2018-03-28 01:25:23 +0100
commitdeecb4c1aab780047d79978c636eeb879dd68630 (patch)
tree12659de39ecad629c54d9a6296465a25aa4bea30 /pkgs/applications/networking/cluster
parentdfff83a14ee0b69281a5947aadb84541b05b2e29 (diff)
downloadnixlib-deecb4c1aab780047d79978c636eeb879dd68630.tar
nixlib-deecb4c1aab780047d79978c636eeb879dd68630.tar.gz
nixlib-deecb4c1aab780047d79978c636eeb879dd68630.tar.bz2
nixlib-deecb4c1aab780047d79978c636eeb879dd68630.tar.lz
nixlib-deecb4c1aab780047d79978c636eeb879dd68630.tar.xz
nixlib-deecb4c1aab780047d79978c636eeb879dd68630.tar.zst
nixlib-deecb4c1aab780047d79978c636eeb879dd68630.zip
terraform: Wrap PATH of propagatedBuildInputs (#37861)
Plugins (namely terraform-provider-libvirt) may have a run time
dependency on external binaries.
Diffstat (limited to 'pkgs/applications/networking/cluster')
-rw-r--r--pkgs/applications/networking/cluster/terraform/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 8b3e83ea86fe..00b753a61a8f 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -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;