From ddeac5d0f4bb95095ea611af3d3b5300c5cfa40a Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Tue, 14 Jan 2025 21:19:28 +0100 Subject: [PATCH] mlx42: fix build with clang --- pkgs/by-name/ml/mlx42/package.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ml/mlx42/package.nix b/pkgs/by-name/ml/mlx42/package.nix index a439b5dcd484..387a7966b871 100644 --- a/pkgs/by-name/ml/mlx42/package.nix +++ b/pkgs/by-name/ml/mlx42/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, glfw, enableShared ? !stdenv.hostPlatform.isStatic, @@ -19,13 +20,23 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/HCP6F7N+J97n4orlLxg/4agEoq4+rJdpeW/3q+DI1I="; }; + patches = [ + # clang no longer allows using -Ofast + # see: https://github.com/codam-coding-college/MLX42/issues/147 + (fetchpatch { + name = "replace-ofast-with-o3.patch"; + url = "https://github.com/codam-coding-college/MLX42/commit/ce254c3a19af8176787601a2ac3490100a5c4c61.patch"; + hash = "sha256-urL/WVOXinf7hWR5kH+bAVTcAzldkkWfY0+diSf7jHE="; + }) + ]; + postPatch = '' patchShebangs --build ./tools '' + lib.optionalString enableShared '' substituteInPlace CMakeLists.txt \ - --replace-fail "mlx42 STATIC" "mlx42 SHARED" + --replace-fail "mlx42 STATIC" "mlx42 SHARED" ''; strictDeps = true;