From a225a00c331e816c77984a789b4b29497f9f59f6 Mon Sep 17 00:00:00 2001 From: kaynetik Date: Fri, 10 Apr 2026 18:25:13 +0200 Subject: [PATCH] tfenv: fix path collisions Signed-off-by: kaynetik --- pkgs/by-name/tf/tfenv/package.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/tf/tfenv/package.nix b/pkgs/by-name/tf/tfenv/package.nix index fee5db080b1a..416876afb871 100644 --- a/pkgs/by-name/tf/tfenv/package.nix +++ b/pkgs/by-name/tf/tfenv/package.nix @@ -33,22 +33,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - mkdir -p $out/bin $out/lib $out/libexec $out/share + mkdir -p $out/bin $out/share/tfenv $out/share/doc/tfenv - cp -r lib/* $out/lib/ - cp -r libexec/* $out/libexec/ - cp -r share/* $out/share/ + cp -r bin lib libexec share CHANGELOG.md $out/share/tfenv/ - install -m0644 CHANGELOG.md $out/CHANGELOG.md - - install -m0755 bin/tfenv $out/bin/tfenv - install -m0755 bin/terraform $out/bin/terraform + ln -s $out/share/tfenv/CHANGELOG.md $out/share/doc/tfenv/CHANGELOG.md runHook postInstall ''; postFixup = '' - for f in $out/bin/* $out/libexec/*; do + for f in $out/share/tfenv/bin/* $out/share/tfenv/libexec/*; do [ -f "$f" ] || continue wrapProgram "$f" \ --prefix PATH : "${ @@ -62,6 +57,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { ] }" done + + ln -s $out/share/tfenv/bin/tfenv $out/bin/tfenv + ln -s $out/share/tfenv/bin/terraform $out/bin/terraform ''; passthru.updateScript = nix-update-script { };