From 094df66621ae35b31c3ab8d24fc36d2b5fe5a938 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Wed, 31 Jan 2024 13:52:24 -0500 Subject: [PATCH] Pin the clang version to 11 for lean beause reasons. --- nix/base-system/flake.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index 920a353..1f88e77 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -213,7 +213,11 @@ EOF"; config = { nixpkgs.overlays = [ - rust-overlay + (final: prev: { + # This is needed because the ccache used by lean4Pkg is broken + ccache = prev.ccache.override { doCheck = false; }; + }) + rust-overlay ]; # TODO(jwall): This is needed for terraform @@ -241,7 +245,9 @@ EOF"; # TODO(jwall): This appears to be broken due to: https://github.com/NixOS/nixpkgs/issues/166205 # Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624 #isabelle - lean4 + # TODO(jwall): This appears to be broken due to: https://github.com/NixOS/nixpkgs/issues/166205 + # Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624 + (lean4.override { stdenv = stdenv.override { allowedRequisites = null; cc = llvmPackages_11.clang; }; }) terraform # TODO(jeremy): Replace with opentofu when that is an option. consul consul-template @@ -294,8 +300,9 @@ EOF"; # TODO(jwall): I include these initially for nvim telescope ripgrep fd - lldb - llvmPackages.bintools-unwrapped + lldb_11 + # TODO(jwall): For now it appears that a bunch of things around linking are broken on darwin so we are going to use clang11 + llvmPackages_11.libcxxClang # TODO add sonic-pi here if it supports the arch ]) ++ (with pkgs.ocamlPackages; [