mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-18 14:41:18 +00:00
Revert "gtk4: fix build on darwin by linking with lld"
The ld64 issue has been fixed.
This reverts commit d846912fb0.
This commit is contained in:
@@ -60,7 +60,6 @@
|
||||
compileSchemas ? stdenv.hostPlatform.emulatorAvailable buildPackages,
|
||||
cups,
|
||||
libexecinfo,
|
||||
llvmPackages,
|
||||
broadwaySupport ? true,
|
||||
testers,
|
||||
darwinMinVersionHook,
|
||||
@@ -131,10 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
++ lib.optionals vulkanSupport [
|
||||
shaderc # for glslc
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# TODO: Remove when NixOS/nixpkgs#536365 reaches master.
|
||||
llvmPackages.lld
|
||||
]
|
||||
++ finalAttrs.setupHooks;
|
||||
|
||||
buildInputs = [
|
||||
@@ -226,10 +221,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isMusl {
|
||||
NIX_LDFLAGS = "-lexecinfo";
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# TODO: Remove when NixOS/nixpkgs#536365 reaches master.
|
||||
NIX_CFLAGS_LINK = "--ld-path=${lib.getExe' llvmPackages.lld "ld64.lld"}";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user