aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2023-02-05 14:16:27 +0100
committerRobert Hensing <robert@roberthensing.nl>2023-04-07 17:50:40 +0200
commit1c0b680ef9ca9604ff993a9d693355254ddc5bf4 (patch)
treead86ae0ea622361c7b5e9aef491ebf010b08449a
parent2445afd92c99ec0901a0e1a00fadda12aad15220 (diff)
libstore: Remove lockCPU dead code
Left over from 9747ea84b, https://github.com/NixOS/nix/pull/5821
-rw-r--r--perl/lib/Nix/Store.xs1
-rw-r--r--src/libstore/globals.cc1
2 files changed, 0 insertions, 2 deletions
diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs
index b3f192810..10a0c4067 100644
--- a/perl/lib/Nix/Store.xs
+++ b/perl/lib/Nix/Store.xs
@@ -27,7 +27,6 @@ static ref<Store> store()
if (!_store) {
try {
initLibStore();
- settings.lockCPU = false;
_store = openStore();
} catch (Error & e) {
croak("%s", e.what());
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 3f944f024..1b38e32fb 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -49,7 +49,6 @@ Settings::Settings()
, nixDaemonSocketFile(canonPath(getEnvNonEmpty("NIX_DAEMON_SOCKET_PATH").value_or(nixStateDir + DEFAULT_SOCKET_PATH)))
{
buildUsersGroup = getuid() == 0 ? "nixbld" : "";
- lockCPU = getEnv("NIX_AFFINITY_HACK") == "1";
allowSymlinkedStore = getEnv("NIX_IGNORE_SYMLINK_STORE") == "1";
auto sslOverride = getEnv("NIX_SSL_CERT_FILE").value_or(getEnv("SSL_CERT_FILE").value_or(""));