mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-18 14:41:18 +00:00
Revert "godot: fix build on darwin by linking with lld"
The ld64 issue has been fixed.
This reverts commit 0a930dd847.
This commit is contained in:
@@ -38,7 +38,6 @@
|
||||
libxkbcommon,
|
||||
libxrandr,
|
||||
libxrender,
|
||||
llvmPackages,
|
||||
makeWrapper,
|
||||
mbedtls,
|
||||
miniupnpc,
|
||||
@@ -399,8 +398,6 @@ let
|
||||
"-I${lib.getDev harfbuzz-icu}/include/harfbuzz"
|
||||
"-I${lib.getDev recastnavigation}/include/recastnavigation"
|
||||
];
|
||||
# TODO: Remove when NixOS/nixpkgs#536365 reaches master.
|
||||
NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
|
||||
};
|
||||
|
||||
preConfigure = lib.optionalString (editor && withMono) ''
|
||||
@@ -646,8 +643,6 @@ let
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
[
|
||||
darwin.sigtool
|
||||
# TODO: Remove when NixOS/nixpkgs#536365 reaches master.
|
||||
llvmPackages.lld
|
||||
]
|
||||
++ lib.optionals (!editor) [
|
||||
strip-nondeterminism
|
||||
|
||||
Reference in New Issue
Block a user