refactor(package): share more stuff #320

Merged
jalil merged 1 commit from push-znpsruvkvszt into main 2025-07-13 19:11:06 +02:00
2 changed files with 13 additions and 12 deletions

View file

@ -1,15 +1,16 @@
let
inherit (builtins.getFlake (builtins.toString ./.)) inputs;
in
{ {
pkgs ? pkgs ? inputs.nixpkgs.legacyPackages.${builtins.currentSystem},
(builtins.getFlake (builtins.toString ./.)).inputs.nixpkgs.legacyPackages.${builtins.currentSystem},
lib ? pkgs.lib, lib ? pkgs.lib,
crane ? (builtins.getFlake (builtins.toString ./.)).inputs.crane, crane ? inputs.crane,
pkgSrc ? ./., craneLib ? crane.mkLib pkgs,
cargoArtifacts ? null,
src ? craneLib.cleanCargoSource ./.,
mold ? pkgs.mold, mold ? pkgs.mold,
}: }:
let let
craneLib = crane.mkLib pkgs;
src = craneLib.cleanCargoSource pkgSrc;
commonArgs = { commonArgs = {
inherit src; inherit src;
strictDeps = true; strictDeps = true;
@ -26,12 +27,13 @@ let
mainProgram = "webnsupdate"; mainProgram = "webnsupdate";
}; };
}; };
cargoArtifacts = craneLib.buildDepsOnly commonArgs;
in in
craneLib.buildPackage ( craneLib.buildPackage (
lib.mergeAttrsList [ lib.mergeAttrsList [
commonArgs commonArgs
{ inherit cargoArtifacts; } {
cargoArtifacts =
if cargoArtifacts == null then craneLib.buildDepsOnly commonArgs else cargoArtifacts;
}
] ]
) )

View file

@ -44,8 +44,7 @@ in
{ inherit cargoArtifacts; } { inherit cargoArtifacts; }
]; ];
webnsupdate = pkgs.callPackage ../default.nix { webnsupdate = pkgs.callPackage ../default.nix {
inherit crane; inherit craneLib cargoArtifacts src;
pkgSrc = src;
}; };
in in
{ {