Use mkLib pattern

Signed-off-by: Marcel Müller <neikos@neikos.email>
This commit is contained in:
Marcel Müller 2025-03-04 10:53:57 +01:00
parent 89f5401e5d
commit 85ba1e39cc
3 changed files with 13 additions and 15 deletions

View file

@ -24,29 +24,22 @@
};
rustTarget = pkgs.rust-bin.stable.latest.default.override { };
craneLib = (inputs.crane.mkLib pkgs).overrideToolchain rustTarget;
lib = import ./lib {
inherit
inputs
craneLib
pkgs
;
dylintLib = import ./mk-lib.nix {
inherit pkgs;
inherit (inputs) crane;
};
lints = [
{
toolchain = "2025-01-09";
package = lib.cargo-dylint-general;
package = dylintLib.cargo-dylint-general;
}
];
dylint = lib.mkDylint { inherit lints; };
dylint = dylintLib.mkDylint { inherit lints; };
in
{
packages = lib // {
inherit craneLib;
rust = rustTarget;
};
mkLib = import ./mk-lib.nix;
devShells.default = pkgs.mkShell {
nativeBuildInputs = [

View file

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

6
mk-lib.nix Normal file
View file

@ -0,0 +1,6 @@
{ pkgs, crane }:
import ./lib {
inherit pkgs;
craneLib = (crane.mkLib pkgs).overrideToolchain pkgs.rust-bin.stable.latest.default;
}