From 4b10bb99399277544832847c0d6141bdd1ae8825 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 22 Sep 2022 09:24:15 +1000 Subject: [PATCH] Revert "rustc: build with jemalloc" This reverts commit 2a699029f43a2d467b07fc42bea8fd975ffa766f. hopefully this fixes building x86_64-darwin under emulation on aarch64-darwin --- pkgs/development/compilers/rust/rustc.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 5fd3741607469..bb5bc1bb1d733 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -107,9 +107,6 @@ in stdenv.mkDerivation rec { "${setHost}.musl-root=${pkgsBuildHost.targetPackages.stdenv.cc.libc}" ] ++ optionals stdenv.targetPlatform.isMusl [ "${setTarget}.musl-root=${pkgsBuildTarget.targetPackages.stdenv.cc.libc}" - ] ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ - # https://github.com/rust-lang/rust/issues/92173 - "--set rust.jemalloc" ]; # The bootstrap.py will generated a Makefile that then executes the build.