wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 09:31:16 +02:00
Code Activity

Merge pull request #12505 from NixOS/mergify/bp/2.26-maintenance/pr-12497

Browse source 
Don't override default man search paths (backport #12497)
This commit is contained in:
John Ericson 2025-02-18 12:17:08 -05:00 • committed by GitHub
commit 6c15761b0e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix/man-pages.cc
View file

@ -13,7 +13,7 @@ std::filesystem::path getNixManDir()
void showManPage(const std::string & name) void showManPage(const std::string & name)
{ {
restoreProcessContext(); restoreProcessContext();
setEnv("MANPATH", getNixManDir().c_str()); setEnv("MANPATH", (getNixManDir().string() + ":").c_str());
execlp("man", "man", name.c_str(), nullptr); execlp("man", "man", name.c_str(), nullptr);
if (errno == ENOENT) { if (errno == ENOENT) {
// Not SysError because we don't want to suffix the errno, aka No such file or directory. // Not SysError because we don't want to suffix the errno, aka No such file or directory.