From 03752ca7cad3ff83007b72e4020c9a9a8d7eed9f Mon Sep 17 00:00:00 2001 From: Nadja Yang Date: Thu, 4 Jun 2026 23:14:36 -0400 Subject: [PATCH] lean4, leanPackages.lean4: fix darwin build by adding libtool Lake 4.30.0 uses libtool -static on macOS for static library targets instead of ar. https://github.com/leanprover/lean4/blob/d024af099ca4bf2c86f649261ebf59565dc8c622/src/lake/Lake/Build/Library.lean#L87-L95 See Hydra Build No. 330752454, lean4.aarch64-darwin (June 4, 2026), https://hydra.nixos.org/build/330752454; Hydra Build No. 330752481, leanPackages.lean4.aarch64-darwin (June 4, 2026), https://hydra.nixos.org/build/330752481. Breakage introduced in https://github.com/NixOS/nixpkgs/pull/526718/commits/a26b66330f6fa572e7005ee2a1eb031093456e6e --- pkgs/by-name/le/lean4/package.nix | 4 +++- pkgs/development/lean-modules/lean4/default.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix index a1016a1b437a..8d98ebd2c356 100644 --- a/pkgs/by-name/le/lean4/package.nix +++ b/pkgs/by-name/le/lean4/package.nix @@ -2,6 +2,7 @@ lib, stdenv, cmake, + cctools, fetchFromGitHub, git, gmp, @@ -67,7 +68,8 @@ stdenv.mkDerivation (finalAttrs: { pkg-config makeWrapper leangz # Provides leantar - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ]; buildInputs = [ gmp diff --git a/pkgs/development/lean-modules/lean4/default.nix b/pkgs/development/lean-modules/lean4/default.nix index d521467d50cb..3f62f6151b8f 100644 --- a/pkgs/development/lean-modules/lean4/default.nix +++ b/pkgs/development/lean-modules/lean4/default.nix @@ -4,6 +4,7 @@ stdenv, symlinkJoin, cmake, + cctools, fetchFromGitHub, git, gmp, @@ -75,7 +76,8 @@ let cmake leangz pkg-config - ]; + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools.libtool ]; buildInputs = [ gmp