From fbe29615df785c91b8501690c90fa2728a7195f5 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Mon, 17 Jun 2024 16:21:49 +0300 Subject: chore(tvix): Remove no longer needed rlib stripping fix for darwin This issue was fixed in https://github.com/NixOS/nixpkgs/pull/255900 Change-Id: I4f569099e62c4284bdea18a512387735f139e702 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11854 Tested-by: BuildkiteCI Reviewed-by: flokli Autosubmit: Ilan Joselevich --- tvix/default.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tvix/default.nix b/tvix/default.nix index e1b8781ba603..98e9fd01e83b 100644 --- a/tvix/default.nix +++ b/tvix/default.nix @@ -36,18 +36,6 @@ let inherit pkgs; nixpkgs = pkgs.path; - # Hack to fix Darwin build - # See https://github.com/NixOS/nixpkgs/issues/218712 - buildRustCrateForPkgs = pkgs: - if pkgs.stdenv.isDarwin then - let - buildRustCrate = pkgs.buildRustCrate; - buildRustCrate_ = args: buildRustCrate args // { dontStrip = true; }; - override = o: args: buildRustCrate.override o (args // { dontStrip = true; }); - in - pkgs.makeOverridable override { } - else pkgs.buildRustCrate; - defaultCrateOverrides = pkgs.defaultCrateOverrides // { zstd-sys = prev: { nativeBuildInputs = prev.nativeBuildInputs or [ ]; -- cgit 1.4.1