wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 09:11:47 +02:00
Code Activity

Merge remote-tracking branch 'upstream/master' into messages-present-tense

Browse source
This commit is contained in:
Luc Perkins 2025-06-18 08:24:23 -07:00
commit d6710b4c04
No known key found for this signature in database
GPG key ID: C86EE5D85EE4DDA5
43 changed files with 984 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/linux/include/nix/store/meson.build
View file

@ -1,5 +1,3 @@
include_dirs += include_directories('../..')
headers += files(
'personality.hh',
)
headers += files('personality.hh')

4
src/libstore/linux/meson.build
View file

@ -1,5 +1,3 @@
sources += files(
'personality.cc',
)
sources += files('personality.cc')
subdir('include/nix/store')

2
src/libstore/local-store.cc
View file

@ -133,7 +133,7 @@ LocalStore::LocalStore(ref<const Config> config)
Path gcRootsDir = config->stateDir + "/gcroots";
if (!pathExists(gcRootsDir)) {
createDirs(gcRootsDir);
createSymlink(profilesDir, gcRootsDir + "/profiles");
replaceSymlink(profilesDir, gcRootsDir + "/profiles");
}
for (auto & perUserDir : {profilesDir + "/per-user", gcRootsDir + "/per-user"}) {