Skip to content

Commit 93499c5

Browse files
committed
fix(config): check for lib64. Fixes #1343
1 parent 788feaf commit 93499c5

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

.editorconfig

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
indent_style = space
11+
indent_size = 2
12+
charset = utf-8

lua/lazy/core/config.lua

+4-1
Original file line numberDiff line numberDiff line change
@@ -284,14 +284,17 @@ function M.setup(opts)
284284

285285
M.me = debug.getinfo(1, "S").source:sub(2)
286286
M.me = Util.norm(vim.fn.fnamemodify(M.me, ":p:h:h:h:h"))
287+
local lib = vim.fn.fnamemodify(vim.v.progpath, ":p:h:h") .. "/lib"
288+
lib = vim.uv.fs_stat(lib .. "64") and (lib .. "64") or lib
289+
lib = lib .. "/nvim"
287290
if M.options.performance.rtp.reset then
288291
---@type vim.Option
289292
vim.opt.rtp = {
290293
vim.fn.stdpath("config"),
291294
vim.fn.stdpath("data") .. "/site",
292295
M.me,
293296
vim.env.VIMRUNTIME,
294-
vim.fn.fnamemodify(vim.v.progpath, ":p:h:h") .. "/lib/nvim",
297+
lib,
295298
vim.fn.stdpath("config") .. "/after",
296299
}
297300
end

0 commit comments

Comments
 (0)