nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 20:16:03 +01:00
Code Activity

Merge remote-tracking branch 'origin/master' into flakes

Browse source
This commit is contained in:
Eelco Dolstra 2019-05-08 14:30:27 +02:00
commit 2bc55aba1e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
23 changed files with 167 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libutil/util.cc
View file

@ -38,6 +38,9 @@ extern char * * environ;
namespace nix {
const std::string nativeSystem = SYSTEM;
BaseError & BaseError::addPrefix(const FormatOrString & fs)
{
prefix_ = fs.s + prefix_;