From 890d046e97c62390779d5ec2bc115d33642657ed Mon Sep 17 00:00:00 2001 From: Mathis Antony Date: Sat, 16 May 2026 16:20:24 +0200 Subject: [PATCH] rlottie: fix build on darwin --- pkgs/by-name/rl/rlottie/package.nix | 5 +++++ .../rename_format_to_run-clang-format.patch | 16 ++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/by-name/rl/rlottie/rename_format_to_run-clang-format.patch diff --git a/pkgs/by-name/rl/rlottie/package.nix b/pkgs/by-name/rl/rlottie/package.nix index a6df6d169045..af12470f0f6f 100644 --- a/pkgs/by-name/rl/rlottie/package.nix +++ b/pkgs/by-name/rl/rlottie/package.nix @@ -25,6 +25,11 @@ stdenv.mkDerivation { pkg-config ]; + patches = [ + # rename format to run-clang-format to avoid conflict + ./rename_format_to_run-clang-format.patch + ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 ) "-U__ARM_NEON__"; diff --git a/pkgs/by-name/rl/rlottie/rename_format_to_run-clang-format.patch b/pkgs/by-name/rl/rlottie/rename_format_to_run-clang-format.patch new file mode 100644 index 000000000000..df885bbba5af --- /dev/null +++ b/pkgs/by-name/rl/rlottie/rename_format_to_run-clang-format.patch @@ -0,0 +1,16 @@ +From c949a713c36cd7a5cf95dd0d07a5660c0204ce0d Mon Sep 17 00:00:00 2001 +From: Mathis Antony +Date: Sat, 16 May 2026 14:35:08 +0200 +Subject: [PATCH] rename format to run-clang-format + +- `format` conflicts with the C++ header +- fixes: https://hydra.nixos.org/build/327171293/nixlog/1 +--- + format => run-clang-format | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + rename format => run-clang-format (100%) + +diff --git a/format b/run-clang-format +similarity index 100% +rename from format +rename to run-clang-format