diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index efe13a52d07a..f1e19c060cdd 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, darwin }: +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }: let target = if stdenv.isDarwin then "macOS" else "Linux"; in @@ -20,17 +20,10 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Foundation + CoreFoundation + Foundation ]; - # 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 - ''; - preBuild = '' cd 3rd/luamake '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c384a14b817..2dd6b2e50118 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35189,7 +35189,9 @@ with pkgs; sqsh = callPackage ../development/tools/sqsh { }; - sumneko-lua-language-server = callPackage ../development/tools/sumneko-lua-language-server { }; + sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/sumneko-lua-language-server { + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; + }; sysz = callPackage ../tools/misc/sysz { };