From 0ddfbc5939e38d2cc3ab195e7093d4b62a0b626b Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 22 Mar 2025 12:16:47 +0000 Subject: [PATCH] packaging/everything.nix: Fix doc and man outputs We want the $doc, $man outputs to be symlinks pointing to nix-manual and nix-manual.man. Creating the directories first makes the `ln` command produce symlink $doc/${nix-manual} instead. ``` $file /nix/store/q4dwlnd36gpfajgfcp6hca2xwy068wjq-nix-2.27.1-man/rwh8ky3k040wyrywl8k2v5b3csdfbdg7-nix-manual-2.27.1-man /nix/store/q4dwlnd36gpfajgfcp6hca2xwy068wjq-nix-2.27.1-man/rwh8ky3k040wyrywl8k2v5b3csdfbdg7-nix-manual-2.27.1-man: symbolic link to /nix/store/rwh8ky3k040wyrywl8k2v5b3csdfbdg7-nix-manual-2.27.1-man ``` This is the reason `nix-env --help` is once again broken on 2.26/2.27/master after 4108529. --- packaging/everything.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/everything.nix b/packaging/everything.nix index c9ad26823..75ef1c11d 100644 --- a/packaging/everything.nix +++ b/packaging/everything.nix @@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: { devPaths = lib.mapAttrsToList (_k: lib.getDev) finalAttrs.finalPackage.libs; in '' - mkdir -p $out $dev $doc $man + mkdir -p $out $dev # Merged outputs lndir ${nix-cli} $out