diff options
| author | Emily <vcs@emily.moe> | 2021-09-14 02:06:56 +0100 |
|---|---|---|
| committer | Emily <vcs@emily.moe> | 2021-09-14 03:31:31 +0100 |
| commit | 35a1ca8a0a8fb680affc784c20415f47b067d296 (patch) | |
| tree | 3f951e3a423a3ed969a27e5b117e0b7b2d933d98 | |
| parent | bca7162d606e7b5fd1d1fe9324fed5d645624c5c (diff) | |
| download | nixpkgs-35a1ca8a0a8fb680affc784c20415f47b067d296.tar nixpkgs-35a1ca8a0a8fb680affc784c20415f47b067d296.tar.gz nixpkgs-35a1ca8a0a8fb680affc784c20415f47b067d296.tar.bz2 nixpkgs-35a1ca8a0a8fb680affc784c20415f47b067d296.tar.lz nixpkgs-35a1ca8a0a8fb680affc784c20415f47b067d296.tar.xz nixpkgs-35a1ca8a0a8fb680affc784c20415f47b067d296.tar.zst nixpkgs-35a1ca8a0a8fb680affc784c20415f47b067d296.zip | |
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.
| -rw-r--r-- | pkgs/os-specific/darwin/trash/trash.diff | 2 |
1 files changed, 1 insertions, 1 deletions
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 |