diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-30T22·11+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-30T22·17+0100 |
commit | 699ab4e20a252c649339831e7c1b8a028d9fd8e8 (patch) | |
tree | bb763cf0c51e9fe295c3fd1be56ef8c925ca2902 /third_party/nix/src/libstore/local-store.cc | |
parent | 91ddc7603d2fa2b59299375adc8a245558a9e811 (diff) |
chore(3p/nix): Clean up some unused defines r/872
Diffstat (limited to 'third_party/nix/src/libstore/local-store.cc')
-rw-r--r-- | third_party/nix/src/libstore/local-store.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/third_party/nix/src/libstore/local-store.cc b/third_party/nix/src/libstore/local-store.cc index 2f35dd69c4fb..e7746973f956 100644 --- a/third_party/nix/src/libstore/local-store.cc +++ b/third_party/nix/src/libstore/local-store.cc @@ -320,16 +320,6 @@ void LocalStore::openDB(State& state, bool create) { throw Error(format("cannot open Nix database '%1%'") % dbPath); } -#ifdef __CYGWIN__ - /* The cygwin version of sqlite3 has a patch which calls - SetDllDirectory("/usr/bin") on init. It was intended to fix extension - loading, which we don't use, and the effect of SetDllDirectory is - inherited by child processes, and causes libraries to be loaded from - /usr/bin instead of $PATH. This breaks quite a few things (e.g. - checkPhase on openssh), so we set it back to default behaviour. */ - SetDllDirectoryW(L""); -#endif - if (sqlite3_busy_timeout(db, 60 * 60 * 1000) != SQLITE_OK) { throwSQLiteError(db, "setting timeout"); } @@ -381,7 +371,6 @@ void LocalStore::openDB(State& state, bool create) { /* To improve purity, users may want to make the Nix store a read-only bind mount. So make the Nix store writable for this process. */ void LocalStore::makeStoreWritable() { -#if __linux__ if (getuid() != 0) { return; } @@ -401,7 +390,6 @@ void LocalStore::makeStoreWritable() { throw SysError(format("remounting %1% writable") % realStoreDir); } } -#endif } const time_t mtimeStore = 1; /* 1 second into the epoch */ |