pyrox.dev / nixpkgs
lol
fork atom

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

Yureka 799fff88 35925e55

+39 -14
unified split
+2
pkgs/applications/blockchains/lighthouse/default.nix
··· 14 14 , rustPlatform 15 15 , Security 16 16 , sqlite 17 + , rust-jemalloc-sys 17 18 , stdenv 18 19 , SystemConfiguration 19 20 , testers ··· 70 71 71 72 buildInputs = [ 72 73 sqlite 74 + rust-jemalloc-sys 73 75 ] ++ lib.optionals stdenv.isDarwin [ 74 76 CoreFoundation 75 77 Security
+4 -1
pkgs/applications/blockchains/polkadot/default.nix
··· 2 2 , lib 3 3 , protobuf 4 4 , rocksdb 5 + , rust-jemalloc-sys-unprefixed 5 6 , rustPlatform 6 7 , rustc-wasm32 7 8 , stdenv ··· 60 61 rustc-wasm32.llvmPackages.lld 61 62 ]; 62 63 63 - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; 64 + buildInputs = [ 65 + rust-jemalloc-sys-unprefixed 66 + ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; 64 67 65 68 # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target 66 69 CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld";
+2
pkgs/applications/office/activitywatch/default.nix
··· 5 5 , pkg-config 6 6 , perl 7 7 , openssl 8 + , rust-jemalloc-sys 8 9 , python3 9 10 , wrapQtAppsHook 10 11 , qtbase ··· 173 174 174 175 buildInputs = [ 175 176 openssl 177 + rust-jemalloc-sys 176 178 ]; 177 179 178 180 postFixup = ''
+4 -1
pkgs/development/python-modules/polars/default.nix
··· 6 6 , libiconv 7 7 , fetchFromGitHub 8 8 , typing-extensions 9 + , rust-jemalloc-sys 9 10 , darwin 10 11 }: 11 12 let ··· 49 50 50 51 nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ]; 51 52 52 - buildInputs = lib.optionals stdenv.isDarwin [ 53 + buildInputs = [ 54 + rust-jemalloc-sys 55 + ] ++ lib.optionals stdenv.isDarwin [ 53 56 libiconv 54 57 darwin.apple_sdk.frameworks.Security 55 58 ];
+4 -7
pkgs/development/tools/ruff/default.nix
··· 4 4 , installShellFiles 5 5 , stdenv 6 6 , darwin 7 + , rust-jemalloc-sys 7 8 # tests 8 9 , ruff-lsp 9 10 }: ··· 31 32 installShellFiles 32 33 ]; 33 34 34 - buildInputs = lib.optionals stdenv.isDarwin [ 35 + buildInputs = [ 36 + rust-jemalloc-sys 37 + ] ++ lib.optionals stdenv.isDarwin [ 35 38 darwin.apple_sdk.frameworks.CoreServices 36 39 ]; 37 40 38 41 cargoBuildFlags = [ "--package=ruff_cli" ]; 39 42 cargoTestFlags = cargoBuildFlags; 40 - 41 - preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' 42 - # See https://github.com/jemalloc/jemalloc/issues/1997 43 - # Using a value of 48 should work on both emulated and native x86_64-darwin. 44 - export JEMALLOC_SYS_WITH_LG_VADDR=48 45 - ''; 46 43 47 44 # tests expect no colors 48 45 preCheck = ''
+2
pkgs/servers/kanidm/default.nix
··· 11 11 , sqlite 12 12 , pam 13 13 , bashInteractive 14 + , rust-jemalloc-sys 14 15 }: 15 16 16 17 let ··· 59 60 openssl 60 61 sqlite 61 62 pam 63 + rust-jemalloc-sys 62 64 ]; 63 65 64 66 # The UI needs to be in place before the tests are run.
+5 -1
pkgs/servers/matrix-conduit/default.nix
··· 7 7 , darwin 8 8 , nixosTests 9 9 , rocksdb 10 + , rust-jemalloc-sys 10 11 }: 11 12 12 13 rustPlatform.buildRustPackage rec { ··· 42 43 pkg-config 43 44 ]; 44 45 45 - buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ 46 + buildInputs = [ 47 + sqlite 48 + rust-jemalloc-sys 49 + ] ++ lib.optionals stdenv.isDarwin [ 46 50 darwin.apple_sdk.frameworks.Security 47 51 ]; 48 52
+5 -1
pkgs/servers/search/qdrant/default.nix
··· 5 5 , stdenv 6 6 , pkg-config 7 7 , openssl 8 + , rust-jemalloc-sys 8 9 , nix-update-script 9 10 , Security 10 11 }: ··· 32 33 # Needed to get openssl-sys to use pkg-config. 33 34 OPENSSL_NO_VENDOR = 1; 34 35 35 - buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; 36 + buildInputs = [ 37 + openssl 38 + rust-jemalloc-sys 39 + ] ++ lib.optionals stdenv.isDarwin [ Security ]; 36 40 37 41 nativeBuildInputs = [ protobuf rustPlatform.bindgenHook pkg-config ]; 38 42
+4 -1
pkgs/servers/search/quickwit/default.nix
··· 4 4 , rustPlatform 5 5 , nix-update-script 6 6 , protobuf 7 + , rust-jemalloc-sys 7 8 , Security 8 9 }: 9 10 ··· 32 33 33 34 sourceRoot = "${src.name}/quickwit"; 34 35 35 - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 36 + buildInputs = [ 37 + rust-jemalloc-sys 38 + ] ++ lib.optionals stdenv.isDarwin [ Security ]; 36 39 37 40 cargoLock = { 38 41 lockFile = ./Cargo.lock;
+3 -1
pkgs/tools/misc/fd/default.nix
··· 1 - { lib, rustPlatform, fetchFromGitHub, installShellFiles, testers, fd }: 1 + { lib, rustPlatform, fetchFromGitHub, installShellFiles, rust-jemalloc-sys, testers, fd }: 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "fd"; ··· 14 14 cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo="; 15 15 16 16 nativeBuildInputs = [ installShellFiles ]; 17 + 18 + buildInputs = [ rust-jemalloc-sys ]; 17 19 18 20 # skip flaky test 19 21 checkFlags = [
+2
pkgs/tools/misc/turbo/default.nix
··· 12 12 , openssl 13 13 , extra-cmake-modules 14 14 , fontconfig 15 + , rust-jemalloc-sys 15 16 , testers 16 17 , turbo 17 18 , nix-update-script ··· 149 150 buildInputs = [ 150 151 openssl 151 152 fontconfig 153 + rust-jemalloc-sys 152 154 ] ++ lib.optionals stdenv.isDarwin [ 153 155 IOKit 154 156 CoreServices
+2 -1
pkgs/tools/misc/vector/default.nix
··· 8 8 , rdkafka 9 9 , oniguruma 10 10 , zstd 11 + , rust-jemalloc-sys 11 12 , Security 12 13 , libiconv 13 14 , coreutils ··· 59 60 }; 60 61 }; 61 62 nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ]; 62 - buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] 63 + buildInputs = [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] 63 64 ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; 64 65 65 66 # needed for internal protobuf c wrapper library