about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIlan Joselevich <personal@ilanjoselevich.com>2024-06-17T13·21+0300
committerIlan Joselevich <personal@ilanjoselevich.com>2024-06-17T14·34+0000
commitfbe29615df785c91b8501690c90fa2728a7195f5 (patch)
tree0ca3582dfce923e06dbf16174f287c5c1a72551c
parent28b692fd507b5a32add96e3694bd1f2959bd9608 (diff)
chore(tvix): Remove no longer needed rlib stripping fix for darwin r/8290
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 <flokli@flokli.de>
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
-rw-r--r--tvix/default.nix12
1 files changed, 0 insertions, 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 [ ];