Revert "gtk2: fix darwin build"

The ld64 issue has been fixed.

This reverts commit adf395eab9.
This commit is contained in:
Emily
2026-07-15 03:26:25 +01:00
parent 075a8a4c38
commit 9ae5809035
+13 -28
View File
@@ -27,8 +27,6 @@
gdktarget ? if stdenv.hostPlatform.isDarwin then "quartz" else "x11",
cupsSupport ? config.gtk2.cups or stdenv.hostPlatform.isLinux,
xineramaSupport ? stdenv.hostPlatform.isLinux,
# TODO: Clean up on `staging`
llvmPackages,
}:
let
@@ -58,19 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
gtkCleanImmodulesCache
];
nativeBuildInputs =
finalAttrs.setupHooks
++ [
gdk-pixbuf
gettext
gobject-introspection
perl
pkg-config
]
# TODO: Clean up on `staging`
++ lib.optionals stdenv.hostPlatform.isDarwin [
llvmPackages.lld
];
nativeBuildInputs = finalAttrs.setupHooks ++ [
gdk-pixbuf
gettext
gobject-introspection
perl
pkg-config
];
patches = [
./patches/2.0-immodules.cache.patch
@@ -128,19 +120,12 @@ stdenv.mkDerivation (finalAttrs: {
"ac_cv_path_GDK_PIXBUF_CSOURCE=${buildPackages.gdk-pixbuf.dev}/bin/gdk-pixbuf-csource"
];
env =
lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-int"
"-Wno-error=incompatible-pointer-types"
];
}
# Fix for ld64 hardening issue
#
# TODO: Clean up on `staging`
// lib.optionalAttrs stdenv.hostPlatform.isDarwin {
NIX_CFLAGS_LINK = "-fuse-ld=lld";
};
env = lib.optionalAttrs stdenv.cc.isGNU {
NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-int"
"-Wno-error=incompatible-pointer-types"
];
};
enableParallelBuilding = true;