From 999cc7ccf56ccc12a3b9e24a93e48036235ac9c3 Mon Sep 17 00:00:00 2001 From: AwesomeQubic Date: Fri, 19 Apr 2024 23:21:07 -0400 Subject: [PATCH] possibly fix macOS builds for nix Signed-off-by: strawberry --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 54cc4a1b..61fafef7 100644 --- a/flake.nix +++ b/flake.nix @@ -66,12 +66,14 @@ builder = pkgs: ((crane.mkLib pkgs).overrideToolchain toolchain).buildPackage; - nativeBuildInputs = pkgs: [ + nativeBuildInputs = pkgs: let + darwin = if pkgs.stdenv.isDarwin then [ pkgs.libiconv ] else []; + in [ # bindgen needs the build platform's libclang. Apparently due to # "splicing weirdness", pkgs.rustPlatform.bindgenHook on its own doesn't # quite do the right thing here. pkgs.pkgsBuildHost.rustPlatform.bindgenHook - ]; + ] ++ darwin; env = pkgs: { CONDUIT_VERSION_EXTRA = self.shortRev or self.dirtyShortRev;