Commit 799fff88 authored by Yureka's avatar Yureka
Browse files

tree-wide: make rust jemalloc-sys use nixpkgs jemalloc build

parent 35925e55

pkgs/applications/blockchains/lighthouse/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
, rustPlatform

, Security

, sqlite

, rust-jemalloc-sys

, stdenv

, SystemConfiguration

, testers
@@ -70,6 +71,7 @@ rustPlatform.buildRustPackage rec { 


  buildInputs = [

    sqlite

    rust-jemalloc-sys

  ] ++ lib.optionals stdenv.isDarwin [

    CoreFoundation

    Security

pkgs/applications/blockchains/polkadot/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, lib

, protobuf

, rocksdb

, rust-jemalloc-sys-unprefixed

, rustPlatform

, rustc-wasm32

, stdenv
@@ -60,7 +61,9 @@ rustPlatform.buildRustPackage rec { 
    rustc-wasm32.llvmPackages.lld

  ];



  buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

  buildInputs = [

    rust-jemalloc-sys-unprefixed

  ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];



  # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target

  CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";

pkgs/applications/office/activitywatch/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, pkg-config

, perl

, openssl

, rust-jemalloc-sys

, python3

, wrapQtAppsHook

, qtbase
@@ -173,6 +174,7 @@ rec { 


    buildInputs = [

      openssl

      rust-jemalloc-sys

    ];



    postFixup = ''

pkgs/development/python-modules/polars/default.nix

+4 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
, libiconv

, fetchFromGitHub

, typing-extensions

, rust-jemalloc-sys

, darwin

}:

let
@@ -49,7 +50,9 @@ buildPythonPackage { 


  nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];



  buildInputs = lib.optionals stdenv.isDarwin [

  buildInputs = [

    rust-jemalloc-sys

  ] ++ lib.optionals stdenv.isDarwin [

    libiconv

    darwin.apple_sdk.frameworks.Security

  ];

pkgs/development/tools/ruff/default.nix

+4 −7
Original line number Diff line number Diff line
@@ -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