diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-06-17T13·28+0300 |
|---|---|---|
| committer | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-06-17T15·08+0000 |
| commit | ac51803ad85853aae64c1f4c12ad0688002cbaa2 (patch) | |
| tree | 789f1c8138e8aa02cc243ec51ef1b70d791ce86d /tvix | |
| parent | 210b4277b6d25c742174d74a13ad5b4313b83955 (diff) | |
chore(tvix): Remove no longer needed libiconv addition for darwin r/8292
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 <personal@ilanjoselevich.com> Reviewed-by: flokli <flokli@flokli.de>
Diffstat (limited to 'tvix')
| -rw-r--r-- | tvix/default.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/tvix/default.nix b/tvix/default.nix index d082e955daaa..887e9f90fdb1 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 |