nrabulinski/settei
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

pkgs/conduit: remove dependency on fenix and crane

Browse source
This commit is contained in:
Nikodem Rabuliński 2025-05-01 10:30:18 +02:00
parent ff4457c267
commit e809826dc8
Signed by: nrabulinski
SSH key fingerprint: SHA256:AZZVyfKStaCo8sbJB+3Rr/CRrlym1oEgw7vMnynJeR8
4 changed files with 16 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

33
pkgs/conduit/default.nix
View file

@ -1,10 +1,6 @@
{
lib,
stdenv,
pkgs,
system,
fenix,
crane,
src,
libiconv,
rocksdb,
@ -12,27 +8,18 @@
rustPlatform,
}:
let
rust =
with fenix.${system};
combine [
stable.cargo
stable.rustc
];
crane' = (crane pkgs).overrideToolchain rust;
rocksdb' = rocksdb.overrideAttrs (
final: prev: {
version = "9.1.1";
src = prev.src.override {
rev = "v${final.version}";
hash = "sha256-/Xf0bzNJPclH9IP80QNaABfhj4IAR5LycYET18VFCXc=";
};
}
);
manifest = (builtins.fromTOML (builtins.readFile "${src}/Cargo.toml")).package;
in
crane'.buildPackage {
rustPlatform.buildRustPackage {
pname = manifest.name;
inherit (manifest) version;
inherit src;
strictDeps = true;
useFetchCargoVendor = true;
cargoHash = "sha256-wESDxtKRMm/jyCr4kc20UuHGcE2s+OCMjfL+l1XihnA=";
nativeBuildInputs = [ rustPlatform.bindgenHook ];
buildInputs = lib.optionals stdenv.isDarwin [
@ -42,8 +29,8 @@ crane'.buildPackage {
];
# Use system RocksDB
ROCKSDB_INCLUDE_DIR = "${rocksdb'}/include";
ROCKSDB_LIB_DIR = "${rocksdb'}/lib";
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
NIX_OUTPATH_USED_AS_RANDOM_SEED = "randomseed";
CONDUIT_VERSION_EXTRA = src.shortRev;
}