diff options
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 |