gnupg{24,1compat}: split info, man & doc outputs

This commit is contained in:
Doron Behar
2026-02-08 17:05:46 +02:00
parent 4098b13ae3
commit 828ff2e417
2 changed files with 22 additions and 10 deletions
+15 -10
View File
@@ -1,4 +1,5 @@
{
lib,
stdenv,
gnupg,
coreutils,
@@ -7,26 +8,30 @@
stdenv.mkDerivation {
pname = "gnupg1compat";
version = gnupg.version;
inherit (gnupg) version outputs;
builder = writeScript "gnupg1compat-builder" ''
builder = writeScript "gnupg1compat-builder" (''
PATH=${coreutils}/bin
# First symlink all top-level dirs
mkdir -p $out
ln -s "${gnupg}/"* $out
''
# 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 $out/bin
mkdir -p $out/bin
ln -s "${gnupg}/bin/"* $out/bin
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 $out/bin/*2; do
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";
+7
View File
@@ -167,6 +167,13 @@ stdenv.mkDerivation rec {
++ lib.optional withTpm2Tss "--with-tss=intel"
++ lib.optional stdenv.hostPlatform.isDarwin "--disable-ccid-driver";
outputs = [
"out"
"info"
"man"
"doc"
];
postInstall =
if enableMinimal then
''