diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:17:20 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:27:15 +0200 |
| commit | 9ff87bb99614923fa3336ab4bbf22e3444709b48 (patch) | |
| tree | fa169a6cc0fdc8d92bb4c4a4f265afc2ba29a890 /nix/libstore/globals.cc | |
| parent | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (diff) | |
| parent | 9e8e252026f558933bdd9cfc26a75d13954b3e8e (diff) | |
| download | patches-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar patches-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libstore/globals.cc')
| -rw-r--r-- | nix/libstore/globals.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc index 6df20e7a52..0cc001fbe4 100644 --- a/nix/libstore/globals.cc +++ b/nix/libstore/globals.cc @@ -70,9 +70,9 @@ void Settings::processEnvironment() nixStateDir = canonPath(getEnv("GUIX_STATE_DIRECTORY", NIX_STATE_DIR)); nixDBPath = getEnv("GUIX_DATABASE_DIRECTORY", nixStateDir + "/db"); nixConfDir = canonPath(getEnv("GUIX_CONFIGURATION_DIRECTORY", GUIX_CONFIGURATION_DIRECTORY)); - nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR)); nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR)); nixDaemonSocketFile = canonPath(nixStateDir + DEFAULT_SOCKET_PATH); + guixProgram = canonPath(getEnv("GUIX", nixBinDir + "/guix")); } |