nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 14:52:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small windows cross fixes (#11230)

Browse Source
This commit is contained in:
John Ericson 2024-07-31 15:04:18 -05:00 committed by GitHub
parent db5bacb637
commit 733c816d34
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libexpr/eval.cc
View File

@ -2860,8 +2860,10 @@ void EvalState::printStatistics()
topObj["cpuTime"] = cpuTime; topObj["cpuTime"] = cpuTime;
#endif #endif
topObj["time"] = { topObj["time"] = {
#ifndef _WIN32 // TODO implement
{"cpu", cpuTime}, {"cpu", cpuTime},
#ifdef HAVE_BOEHMGC #endif
#if HAVE_BOEHMGC
{GC_is_incremental_mode() ? "gcNonIncremental" : "gc", gcFullOnlyTime}, {GC_is_incremental_mode() ? "gcNonIncremental" : "gc", gcFullOnlyTime},
{GC_is_incremental_mode() ? "gcNonIncrementalFraction" : "gcFraction", gcFullOnlyTime / cpuTime}, {GC_is_incremental_mode() ? "gcNonIncrementalFraction" : "gcFraction", gcFullOnlyTime / cpuTime},
#endif #endif

2
src/libstore/gc.cc
View File

@ -891,7 +891,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
void LocalStore::autoGC(bool sync) void LocalStore::autoGC(bool sync)
{ {
#ifdef HAVE_STATVFS #if HAVE_STATVFS
static auto fakeFreeSpaceFile = getEnv("_NIX_TEST_FREE_SPACE_FILE"); static auto fakeFreeSpaceFile = getEnv("_NIX_TEST_FREE_SPACE_FILE");
auto getAvail = [this]() -> uint64_t { auto getAvail = [this]() -> uint64_t {