diff --git a/pkgs/tools/security/gnupg/1compat.nix b/pkgs/tools/security/gnupg/1compat.nix index 69d786f9d9a2..c6556533ea49 100644 --- a/pkgs/tools/security/gnupg/1compat.nix +++ b/pkgs/tools/security/gnupg/1compat.nix @@ -10,28 +10,30 @@ stdenv.mkDerivation { pname = "gnupg1compat"; inherit (gnupg) version outputs; - builder = writeScript "gnupg1compat-builder" ('' - PATH=${coreutils}/bin - '' - # First symlink all top-level dirs, output per output - + lib.concatMapStringsSep "\n" (o: '' - mkdir -p ''$${o} - ln -s "${gnupg.${o}}/"* ''$${o} - '') gnupg.outputs - + '' + builder = writeScript "gnupg1compat-builder" ( + '' + PATH=${coreutils}/bin + '' + # First symlink all top-level dirs, output per output + + lib.concatMapStringsSep "\n" (o: '' + mkdir -p ''$${o} + ln -s "${gnupg.${o}}/"* ''$${o} + '') gnupg.outputs + + '' - # Replace bin with directory and symlink it contents - rm ''${!outputBin}/bin - mkdir -p ''${!outputBin}/bin - ln -s "${lib.getBin gnupg}/bin/"* ''${!outputBin}/bin + # Replace bin with directory and symlink it contents + rm ''${!outputBin}/bin + mkdir -p ''${!outputBin}/bin + ln -s "${lib.getBin gnupg}/bin/"* ''${!outputBin}/bin - # Add symlinks for any executables that end in 2 and lack any non-*2 version - for f in ''${!outputBin}/bin/*2; do - [[ -x $f ]] || continue # ignore failed globs and non-executable files - [[ -e ''${f%2} ]] && continue # ignore commands that already have non-*2 versions - ln -s -- "''${f##*/}" "''${f%2}" - done - ''); + # Add symlinks for any executables that end in 2 and lack any non-*2 version + for f in ''${!outputBin}/bin/*2; do + [[ -x $f ]] || continue # ignore failed globs and non-executable files + [[ -e ''${f%2} ]] && continue # ignore commands that already have non-*2 versions + ln -s -- "''${f##*/}" "''${f%2}" + done + '' + ); meta = gnupg.meta // { description = gnupg.meta.description + " with symbolic links for gpg and gpgv";