From 8f186722a97882ba41330684f37bfe8b8637eba8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Feb 2018 16:05:55 -0600 Subject: Set backup MANPATH in case man path isn’t set correctly. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, this would fail at startup for non-NixOS installs: nix-env --help The fix for this is to just use "nixManDir" as the value for MANPATH when spawning "man". To test this, I’m using the following: $ nix-build release.nix -A build $ MANPATH= ./result/bin/nix-env --help Fixes #1627 --- src/libstore/globals.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libstore/globals.cc') diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index c6b508cbe82f..247040606fb7 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -38,6 +38,7 @@ Settings::Settings() , nixConfDir(canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR))) , nixLibexecDir(canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR))) , nixBinDir(canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR))) + , nixManDir(canonPath(NIX_MAN_DIR)) , nixDaemonSocketFile(canonPath(nixStateDir + DEFAULT_SOCKET_PATH)) { buildUsersGroup = getuid() == 0 ? "nixbld" : ""; -- cgit 1.4.1