alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #180941 from malob/sumneko-lua-language-server-darwin-sdk-update

Browse source
This commit is contained in:
Sandro 2022-07-25 15:35:50 +02:00 committed by GitHub
parent b08ade8295 1be5d0ea4a
commit e9109d950b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/tools/sumneko-lua-language-server/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, darwin }: { lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }:
let let
target = if stdenv.isDarwin then "macOS" else "Linux"; target = if stdenv.isDarwin then "macOS" else "Linux";
in in
@ -20,17 +20,10 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = lib.optionals stdenv.isDarwin [ buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.CoreFoundation CoreFoundation
darwin.apple_sdk.frameworks.Foundation 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 = '' preBuild = ''
cd 3rd/luamake cd 3rd/luamake
'' ''

4
pkgs/top-level/all-packages.nix
View file

@ -35432,7 +35432,9 @@ with pkgs;
sqsh = callPackage ../development/tools/sqsh { }; 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 { }; sysz = callPackage ../tools/misc/sysz { };