Revert "gtk3: fix build on darwin"
The ld64 issue has been fixed.
This reverts commit 7487e9cc51.
This commit is contained in:
@@ -58,8 +58,6 @@
|
||||
broadwaySupport ? true,
|
||||
wayland-scanner,
|
||||
testers,
|
||||
# TODO: Clean up on `staging`
|
||||
llvmPackages,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -144,10 +142,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
]
|
||||
++ lib.optionals waylandSupport [
|
||||
wayland-scanner
|
||||
]
|
||||
# TODO: Clean up on `staging`
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
llvmPackages.lld
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
@@ -219,17 +213,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
# These are the defines that'd you'd get with --enable-debug=minimum (default).
|
||||
# See: https://developer.gnome.org/gtk3/stable/gtk-building.html#extra-configuration-options
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
|
||||
}
|
||||
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
|
||||
# workaround for ld64 hardening issue
|
||||
#
|
||||
# TODO: Clean up on `staging`
|
||||
|
||||
CC_LD = "lld";
|
||||
OBJC_LD = "lld";
|
||||
};
|
||||
env.NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS";
|
||||
|
||||
postPatch = ''
|
||||
# See https://github.com/NixOS/nixpkgs/issues/132259
|
||||
|
||||
Reference in New Issue
Block a user