From 8cd45ee35f1772860dd8e82d9b09e5d96276e82b Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 16 May 2022 20:36:29 -0700 Subject: [PATCH 1/2] sumneko-lua-language-server: 3.2.1 -> 3.2.3 --- .../tools/sumneko-lua-language-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 27606f998d5..11dfb26386f 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.2.1"; + version = "3.2.3"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-rxferVxTWmclviDshHhBmbCezOI+FvcfUW3gAkBQNHQ="; + sha256 = "sha256-n54PWkiB+vXAqIOZ5FOTUNgGhAdBs81Q1WYxJ2XIb8o="; fetchSubmodules = true; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Disable cwd support on darwin, because it requires macOS>=10.15 preConfigure = lib.optionalString stdenv.isDarwin '' for file in 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp 3rd/luamake/3rd/bee.lua/bee/subprocess/subprocess_posix.cpp; do - substituteInPlace $file --replace '#define SUPPORT_CWD 1' "" + substituteInPlace $file --replace '#define USE_POSIX_SPAWN 1' "" done ''; From 4571db9a8845176195b00df3028d6b02adde7325 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 16 May 2022 20:58:41 -0700 Subject: [PATCH 2/2] sumneko-lua-language-server: disable cwd support only on x86-darwin No reason that we shouldn't have it on aarch64-darwin. --- .../development/tools/sumneko-lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 11dfb26386f..9e73c566ef8 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { darwin.apple_sdk.frameworks.Foundation ]; - # Disable cwd support on darwin, because it requires macOS>=10.15 - preConfigure = lib.optionalString stdenv.isDarwin '' + # Disable cwd support on x86 darwin, because it requires macOS>=10.15 + preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' for file in 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp 3rd/luamake/3rd/bee.lua/bee/subprocess/subprocess_posix.cpp; do substituteInPlace $file --replace '#define USE_POSIX_SPAWN 1' "" done