From 0ae746de77e3776d2125a1aa4ea2f53746623989 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:28 +0100 Subject: [PATCH] Revert "imhex: fix build on darwin" The ld64 issue has been fixed. This reverts commit 1f6f094ec0e18408b25b9487d34b402e79cdebc7. --- pkgs/by-name/im/imhex/package.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index 0ce61eea2f86..7b9f98853290 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -23,7 +23,6 @@ nix-update-script, autoPatchelfHook, makeWrapper, - llvmPackages, }: let @@ -62,9 +61,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper ] - ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook - # TODO: Remove once #536365 reaches this branch - ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld; + ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; buildInputs = [ capstone @@ -106,13 +103,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "@executable_path/../Frameworks") ]; - env = { - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # TODO: Remove once #536365 reaches this branch - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # Comment out fixup_bundle in PostprocessBundle.cmake as we are not building a standalone application postPatch = ''