wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2025-06-12 11:12:23 +02:00 • committed by Jörg Thalheim
parent 5acf50a327
commit 2e2fe4cb07
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstore/globals.cc
View file

@ -6,7 +6,6 @@
#include "nix/util/abstract-setting-to-json.hh"
#include "nix/util/compute-levels.hh"
#include "nix/util/signals.hh"
#include "nix/util/types.hh"
#include <algorithm>
#include <map>

3
src/libstore/include/nix/store/local-store.hh
View file

@ -34,7 +34,8 @@ struct OptimiseStats
uint64_t bytesFreed = 0;
};
struct LocalBuildStoreConfig : virtual LocalFSStoreConfig {
struct LocalBuildStoreConfig : virtual LocalFSStoreConfig
{
private:
/**

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

@ -79,14 +79,12 @@ std::string LocalStoreConfig::doc()
Path LocalBuildStoreConfig::getBuildDir() const
{
if (settings.buildDir.get().has_value()) {
return *settings.buildDir.get();
}
if (buildDir.get().has_value()) {
return *buildDir.get();
}
return stateDir.get() + "/builds";
return
settings.buildDir.get().has_value()
? *settings.buildDir.get()
: buildDir.get().has_value()
? *buildDir.get()
: stateDir.get() + "/builds";
}
ref<Store> LocalStore::Config::openStore() const