From 219f896bdf192721446db4fedc338eebf732057d Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 9 Mar 2024 17:31:13 -0600 Subject: [PATCH] chez: Fix aarch64-darwin builds --- pkgs/development/compilers/chez/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index c0448a7e6d4f..ee137a1dfb26 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl , coreutils, cctools +, darwin , ncurses, libiconv, libX11, libuuid, testers }: @@ -12,7 +13,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; }; - nativeBuildInputs = lib.optional stdenv.isDarwin cctools; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ + cctools + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + darwin.autoSignDarwinBinariesHook + ]; buildInputs = [ ncurses libiconv libX11 libuuid ]; enableParallelBuilding = true; @@ -20,10 +25,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=format-truncation"; /* - ** We patch out a very annoying 'feature' in ./configure, which - ** tries to use 'git' to update submodules. - ** - ** We have to also fix a few occurrences to tools with absolute + ** We have to fix a few occurrences to tools with absolute ** paths in some helper scripts, otherwise the build will fail on ** NixOS or in any chroot build. */