Skip to content

Commit

Permalink
Merge pull request #9366 from NixOS/backport-9187-to-2.18-maintenance
Browse files Browse the repository at this point in the history
[2.18-maintenance] Backport #9187 apple-virt
  • Loading branch information
roberth committed Nov 16, 2023
2 parents 184a20e + af21431 commit 8e72a52
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
31 changes: 31 additions & 0 deletions src/libstore/globals.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@

#include "config-impl.hh"

#ifdef __APPLE__
#include <sys/sysctl.h>
#endif

namespace nix {

Expand Down Expand Up @@ -154,6 +157,29 @@ unsigned int Settings::getDefaultCores()
return concurrency;
}

#if __APPLE__
static bool hasVirt() {

int hasVMM;
int hvSupport;
size_t size;

size = sizeof(hasVMM);
if (sysctlbyname("kern.hv_vmm_present", &hasVMM, &size, NULL, 0) == 0) {
if (hasVMM)
return false;
}

// whether the kernel and hardware supports virt
size = sizeof(hvSupport);
if (sysctlbyname("kern.hv_support", &hvSupport, &size, NULL, 0) == 0) {
return hvSupport == 1;
} else {
return false;
}
}
#endif

StringSet Settings::getDefaultSystemFeatures()
{
/* For backwards compatibility, accept some "features" that are
Expand All @@ -170,6 +196,11 @@ StringSet Settings::getDefaultSystemFeatures()
features.insert("kvm");
#endif

#if __APPLE__
if (hasVirt())
features.insert("apple-virt");
#endif

return features;
}

Expand Down
1 change: 1 addition & 0 deletions src/libstore/globals.hh
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,7 @@ public:
`kvm` feature.
This setting by default includes `kvm` if `/dev/kvm` is accessible,
`apple-virt` if hardware virtualization is available on macOS,
and the pseudo-features `nixos-test`, `benchmark` and `big-parallel`
that are used in Nixpkgs to route builds to specific machines.
)", {}, false};
Expand Down

0 comments on commit 8e72a52

Please sign in to comment.