From f5504c82853276ab29e333fb48dd179da762a402 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 19 Feb 2025 21:57:25 +0000 Subject: [PATCH] flake: fix Darwin build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit None of this stuff is necessary these days. This will produce an executable linking against a Nix store `libiconv`, but as the build isn’t static to begin with that should be fine. If a static build is required in the future, `pkgsStatic` can be used as it is in the `nix-installer` flake. --- flake.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/flake.nix b/flake.nix index f9e4ebc..be2e100 100644 --- a/flake.nix +++ b/flake.nix @@ -51,12 +51,7 @@ buildInputs = [ inputs.nix.packages.${final.stdenv.system}.default final.boost - ] ++ final.lib.optionals final.stdenv.isDarwin [ - final.darwin.apple_sdk.frameworks.SystemConfiguration - (final.libiconv.override { enableStatic = true; enableShared = false; }) ]; - - NIX_CFLAGS_LINK = final.lib.optionalString final.stdenv.isDarwin "-lc++abi"; }; cargoArtifacts = craneLib.buildDepsOnly commonArgs; @@ -123,12 +118,8 @@ bacon age - ] ++ lib.optionals pkgs.stdenv.isDarwin [ - libiconv - darwin.apple_sdk.frameworks.SystemConfiguration ]; - NIX_CFLAGS_LINK = lib.optionalString pkgs.stdenv.isDarwin "-lc++abi"; RUST_SRC_PATH = "${pkgs.rustPlatform.rustcSrc}/library"; }; });