From 35a1ca8a0a8fb680affc784c20415f47b067d296 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 14 Sep 2021 02:06:56 +0100 Subject: [PATCH] darwin.trash: fix on aarch64-darwin None of these clang options should be necessary with the nixpkgs stdenv infrastructure, and the -arch was breaking Apple Silicon builds. --- pkgs/os-specific/darwin/trash/trash.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/trash/trash.diff b/pkgs/os-specific/darwin/trash/trash.diff index fa6edf98b3d..d96f6c9c4fe 100644 --- a/pkgs/os-specific/darwin/trash/trash.diff +++ b/pkgs/os-specific/darwin/trash/trash.diff @@ -7,7 +7,7 @@ index 5e4306f..9c975fc 100644 @echo ---- Compiling: @echo ====================================== - $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch i386 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) -+ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -force_cpusubtype_ALL -mmacosx-version-min=10.7 -arch x86_64 -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) ++ $(CC) -O2 -Wall -Wextra -Wpartial-availability -Wno-unguarded-availability -framework AppKit -framework ScriptingBridge -o $@ $(SOURCE_FILES) analyze: @echo