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