mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-09-11 14:35:30 +03:00
Merge pull request #408 from nix-community/remove-makeOutputs-example
Remove makeOutputs from examples
This commit is contained in:
commit
811b2852cc
@ -10,34 +10,19 @@
|
||||
|
||||
allPkgs =
|
||||
l.map
|
||||
# nixpkgs could be imported manually here with overrides etc.
|
||||
(system: inp.dream2nix.inputs.nixpkgs.legacyPackages.${system})
|
||||
["x86_64-linux" "aarch64-linux"];
|
||||
|
||||
initD2N = pkgs:
|
||||
inp.dream2nix.lib.init {
|
||||
inherit pkgs;
|
||||
config.projectRoot = ./.;
|
||||
};
|
||||
|
||||
makeOutputs = pkgs: let
|
||||
outputs = (initD2N pkgs).dream2nix-interface.makeOutputs {
|
||||
source = inp.src;
|
||||
settings = [
|
||||
{
|
||||
builder = "build-rust-package";
|
||||
translator = "cargo-lock";
|
||||
}
|
||||
];
|
||||
};
|
||||
in rec {
|
||||
packages.${pkgs.system} = outputs.packages;
|
||||
# checks.${pkgs.system} = {
|
||||
# inherit (outputs.packages) linemd;
|
||||
# };
|
||||
};
|
||||
|
||||
allOutputs = l.map makeOutputs allPkgs;
|
||||
outputs = l.foldl' l.recursiveUpdate {} allOutputs;
|
||||
in
|
||||
outputs;
|
||||
inp.dream2nix.lib.makeFlakeOutputs {
|
||||
pkgs = allPkgs;
|
||||
config.projectRoot = ./.;
|
||||
source = inp.src;
|
||||
settings = [
|
||||
{
|
||||
builder = "build-rust-package";
|
||||
translator = "cargo-lock";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
@ -53,8 +53,7 @@
|
||||
if l.isList pkgsList
|
||||
then
|
||||
l.listToAttrs
|
||||
(pkgs: l.nameValuePair (makePkgsKey pkgs) pkgs)
|
||||
pkgsList
|
||||
(map (pkgs: l.nameValuePair (makePkgsKey pkgs) pkgs) pkgsList)
|
||||
else {"${makePkgsKey pkgsList}" = pkgsList;}
|
||||
# only systems is specified
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user