Make cargo-dylint build

Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
Marcel Müller 2025-03-03 10:54:55 +01:00
parent c242bdbc1e
commit f37542d964
3 changed files with 32 additions and 28 deletions

View file

@ -18,10 +18,7 @@
let let
pkgs = import inputs.nixpkgs { pkgs = import inputs.nixpkgs {
inherit system; inherit system;
overlays = let overlays = [
selfOverlay = _: _: inputs.self.packages."${system}" or {};
in [
selfOverlay
inputs.rust-overlay.overlays.default inputs.rust-overlay.overlays.default
]; ];
}; };
@ -29,27 +26,18 @@
rustTarget = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; rustTarget = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustTarget; craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustTarget;
callPackage = pkgs.lib.callPackageWith (
pkgs
// {
inherit
inputs
craneLib
;
}
);
lib = import ./lib { lib = import ./lib {
inherit inherit
inputs inputs
callPackage craneLib
pkgs
; ;
}; };
in in
{ {
inherit lib; packages = lib // {
rust = rustTarget;
packages = lib.packages; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -1,7 +1,9 @@
{ {
pkgs, pkgs,
craneLib, craneLib,
...
pkg-config,
openssl,
}: }:
let let
@ -14,15 +16,24 @@ let
tag = "v${version}"; tag = "v${version}";
sha256 = "sha256-Z8uuewp7Buoadayc0oTafmfvwNT36KukWKiHxL/mQfI="; sha256 = "sha256-Z8uuewp7Buoadayc0oTafmfvwNT36KukWKiHxL/mQfI=";
}; };
in
cargoArtifacts = craneLib.buildDepsOnly { craneLib.buildPackage {
inherit pname version src;
};
in craneLib.buildPackage {
inherit inherit
cargoArtifacts
pname pname
version version
src src
; ;
buildInputs = [
openssl
];
nativeBuildInputs = [
pkg-config
];
RUSTUP_TOOLCHAIN = "nightly-2025-02-28";
doCheck = false;
} }

View file

@ -1,10 +1,15 @@
{ {
callPackage, pkgs,
inputs,
craneLib,
... ...
}: }:
{ let
callPackage = pkgs.lib.callPackageWith (pkgs // packages // { inherit inputs craneLib; });
packages = { packages = {
cargo-dylint = callPackage ./cargo-dylint.nix { }; cargo-dylint = callPackage ./cargo-dylint.nix { };
}; };
}
in
packages