diff --git a/hosts/modules/hal/aarch64.nix b/hosts/modules/hal/aarch64.nix
index 478e8e619..45be70604 100644
--- a/hosts/modules/hal/aarch64.nix
+++ b/hosts/modules/hal/aarch64.nix
@@ -20,7 +20,6 @@ in
     sane.programs.fcitx5.enableFor.user.colin = false;
     sane.programs.firefox.config.addons.browserpass-extension.enable = false;  #< does not cross compile
     sane.programs.ltex-ls.enableFor = { system = false; user.colin = false; };  # LaTeX/html/markdown neovim LSP: doesn't cross compile (2024-08-26)
-    sane.programs.lua-language-server.enableFor = { system = false; user.colin = false; };  # lua neovim LSP: doesn't cross compile (2024-08-26)
     sane.programs.marksman.enableFor = { system = false; user.colin = false; };  # markdown neovim LSP: doesn't cross compile (2024-08-26)
     sane.programs.mercurial.enableFor.user.colin = false;
     sane.programs.nvme-cli.enableFor.system = false;  # does not cross compile (libhugetlbfs)
diff --git a/hosts/modules/hal/samsung/cross.nix b/hosts/modules/hal/samsung/cross.nix
index 7818c1e1f..9871164b4 100644
--- a/hosts/modules/hal/samsung/cross.nix
+++ b/hosts/modules/hal/samsung/cross.nix
@@ -12,7 +12,6 @@ in
     sane.programs.efibootmgr.enableFor = { system = false; user.colin = false; };  # efivar doesn't cross compile (2024-09-14)
     sane.programs.fcitx5.enableFor.user.colin = false;
     sane.programs.ltex-ls.enableFor = { system = false; user.colin = false; };  # LaTeX/html/markdown neovim LSP: doesn't cross compile (2024-08-26)
-    sane.programs.lua-language-server.enableFor = { system = false; user.colin = false; };  # lua neovim LSP: doesn't cross compile (2024-08-26)
     sane.programs.marksman.enableFor = { system = false; user.colin = false; };  # markdown neovim LSP: doesn't cross compile (2024-08-26)
     sane.programs.mepo.enableFor.user.colin = false;  # 2024/06/04: doesn't cross compile (nodejs)
     sane.programs.mercurial.enableFor.user.colin = false;  # 2024/06/03: does not cross compile
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index 97347c4d8..3656818ce 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -61,6 +61,12 @@ in
   #   hash = "sha256-Hzz+aAzdgdnTu4jvLqpHzdIE3xYMP02/EuA+KvFbUeI=";
   # })
 
+  (fetchpatch' {
+    name = "lua-language-server: fix cross compiling";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/370992";
+    hash = "sha256-0TG7u+Gcp5y3OKCEG2eDE9D9t+F1zv/I1W6CXlbCOYA=";
+  })
+
   (fetchpatch' {
     # patch should be safe to remove; keeping it here to track the upstreaming status
     name = "nixos/gitea: don't configure the database if `createDatabase == false`";