nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-17 07:52:43 +01:00
Code Activity

Remove lazy lookup in getHome

Browse source 
this seems to break in Musl/Static with:

terminate called after throwing an instance of 'std::bad_function_call'
  what():  bad_function_call
This commit is contained in:
Matthew Bauer 2020-06-25 17:20:29 -04:00 • committed by John Ericson
parent 70719a9dd8
commit da77331cb7
2 changed files with 3 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libutil/util.cc
View file

@ -1,4 +1,3 @@
#include "lazy.hh"
#include "util.hh"
#include "affinity.hh"
#include "sync.hh"
@ -511,7 +510,8 @@ std::string getUserName()
}
static Lazy<Path> getHome2([]() {
static Path getHome2()
{
auto homeDir = getEnv("HOME");
if (!homeDir) {
std::vector<char> buf(16384);
@ -523,7 +523,7 @@ static Lazy<Path> getHome2([]() {
homeDir = pw->pw_dir;
}
return *homeDir;
});
};
Path getHome() { return getHome2(); }