about summary refs log tree commit diff
path: root/pkgs/development/tools/ruff
diff options
context:
space:
mode:
authorYureka <yuka@yuka.dev>2023-07-13 21:13:10 +0200
committerYureka <yuka@yuka.dev>2023-10-20 14:26:07 +0200
commit799fff889b1e8058ea392f93400fbbb8923edc86 (patch)
tree28cfc117799f6f001a606fdc2db0b54c5fd34b78 /pkgs/development/tools/ruff
parent35925e55f2febebf04aca692000b51d4b6365dce (diff)
tree-wide: make rust jemalloc-sys use nixpkgs jemalloc build
Diffstat (limited to 'pkgs/development/tools/ruff')
-rw-r--r--pkgs/development/tools/ruff/default.nix11
1 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix
index b7c5ab87a6443..8b42bfbe85c55 100644
--- a/pkgs/development/tools/ruff/default.nix
+++ b/pkgs/development/tools/ruff/default.nix
@@ -4,6 +4,7 @@
 , installShellFiles
 , stdenv
 , darwin
+, rust-jemalloc-sys
   # tests
 , ruff-lsp
 }:
@@ -31,19 +32,15 @@ rustPlatform.buildRustPackage rec {
     installShellFiles
   ];
 
-  buildInputs = lib.optionals stdenv.isDarwin [
+  buildInputs = [
+    rust-jemalloc-sys
+  ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices
   ];
 
   cargoBuildFlags = [ "--package=ruff_cli" ];
   cargoTestFlags = cargoBuildFlags;
 
-  preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
-    # See https://github.com/jemalloc/jemalloc/issues/1997
-    # Using a value of 48 should work on both emulated and native x86_64-darwin.
-    export JEMALLOC_SYS_WITH_LG_VADDR=48
-  '';
-
   # tests expect no colors
   preCheck = ''
     export NO_COLOR=1