From ade424e602e67aad64574d47d14274f5f5c0381f Mon Sep 17 00:00:00 2001 From: Reno Dakota <170618376+paparodeo@users.noreply.github.com> Date: Wed, 29 May 2024 10:38:51 +0000 Subject: [PATCH] libfpx: use patch to fix clang build register storage specifier which is not supported by c++17 and later https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041 (cherry picked from commit 395122ffc10ccc91bf87eaf6fde3c2981da78915) --- pkgs/development/libraries/libfpx/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 5c77e0139e8a..a51b071dc934 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { url = "https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch"; sha256 = "1gbc0qb2ri1mj9r66wx0yn28fsr7zhhlyz2mwbica8wh34xijgz9"; }) + # fix clang build: remove register keyword + # remove on next update + (fetchpatch { + name = "remove-register-keyword.patch"; + url = "https://github.com/ImageMagick/libfpx/commit/5f340b0a490450b40302cc9948c7dfac60d40041.patch"; + hash = "sha256-6m9MFb1eWGK5cMvPmTu7uh3Pac65r2HPB8wJ8xc1O5o="; + }) ]; meta = with lib; {