Merge pull request #12497 from xokdvium/fix/dont-override-default-man-search-paths

Ericson2314 · web-flow · commit dfb5b2c7cbe2 · 2025-02-18T11:31:01.000-05:00
Don't override default man search paths
diff --git a/src/nix/man-pages.cc b/src/nix/man-pages.cc
@@ -13,7 +13,7 @@ std::filesystem::path getNixManDir()
 void showManPage(const std::string & name)
 {
     restoreProcessContext();
-    setEnv("MANPATH", getNixManDir().c_str());
+    setEnv("MANPATH", (getNixManDir().string() + ":").c_str());
     execlp("man", "man", name.c_str(), nullptr);
     if (errno == ENOENT) {
         // Not SysError because we don't want to suffix the errno, aka No such file or directory.

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