From ac51803ad85853aae64c1f4c12ad0688002cbaa2 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 17 Jun 2024 16:28:52 +0300 Subject: [PATCH] chore(tvix): Remove no longer needed libiconv addition for darwin Since https://github.com/NixOS/nixpkgs/pull/220212 libiconv is now automatically added for Darwin. Change-Id: I2aaa266bcbc4d5a8256131aed36b4c2d040a8758 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11856 Tested-by: BuildkiteCI Autosubmit: Ilan Joselevich Reviewed-by: flokli --- tvix/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tvix/default.nix b/tvix/default.nix index d082e955d..887e9f90f 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -4,7 +4,6 @@ let # crate override for crates that need protobuf protobufDep = prev: (prev.nativeBuildInputs or [ ]) ++ [ pkgs.buildPackages.protobuf ]; - iconvDarwinDep = lib.optional pkgs.stdenv.isDarwin pkgs.libiconv; # On Darwin, some crates producing binaries need to be able to link against security. darwinDeps = lib.optionals pkgs.stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ @@ -34,11 +33,6 @@ let # Load the crate2nix crate tree. crates = pkgs.callPackage ./Cargo.nix { defaultCrateOverrides = pkgs.defaultCrateOverrides // { - zstd-sys = prev: { - nativeBuildInputs = prev.nativeBuildInputs or [ ]; - buildInputs = prev.buildInputs or [ ] ++ iconvDarwinDep; - }; - opentelemetry-proto = prev: { nativeBuildInputs = protobufDep prev; }; @@ -246,7 +240,7 @@ in buildInputs = [ pkgs.fuse - ] ++ iconvDarwinDep; + ] ++ lib.optional pkgs.stdenv.isDarwin pkgs.libiconv; buildPhase = '' cargo doc --document-private-items