Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkgs/by-name/rl/rlottie/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
];

Comment thread
mdaniels5757 marked this conversation as resolved.
env.NIX_CFLAGS_COMPILE = lib.optionalString (
stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
) "-U__ARM_NEON__";
Expand Down
16 changes: 16 additions & 0 deletions pkgs/by-name/rl/rlottie/rename_format_to_run-clang-format.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
From c949a713c36cd7a5cf95dd0d07a5660c0204ce0d Mon Sep 17 00:00:00 2001
From: Mathis Antony <sveitser@gmail.com>
Date: Sat, 16 May 2026 14:35:08 +0200
Subject: [PATCH] rename format to run-clang-format

- `format` conflicts with the C++ <format> 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
Loading