From 05348ed50370765e5760b667f6d1aebc1e8e8240 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 4 Dec 2020 22:31:50 +0100 Subject: pass: support extensions with `$out/bin` An example for that would be `passExtensions.pass-import` where `pimport` is available in `$out/bin`. In that case, `$out/bin` in `buildEnv` isn't a symlink anymore and doesn't need to be removed. Co-authored-by: elseym --- pkgs/tools/security/pass/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 9e9348105010..354437a9bd56 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -34,11 +34,15 @@ let postBuild = '' files=$(find $out/bin/ -type f -exec readlink -f {} \;) - rm $out/bin - mkdir $out/bin + if [ -L $out/bin ]; then + rm $out/bin + mkdir $out/bin + fi for i in $files; do - ln -sf $i $out/bin/$(basename $i) + if ! [ "$(readlink -f "$out/bin/$(basename $i)")" = "$i" ]; then + ln -sf $i $out/bin/$(basename $i) + fi done wrapProgram $out/bin/pass \ -- cgit v1.2.3