From 3fc769d61e0e5102ec9e13d1eda5dca66c1557c5 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Fri, 25 Oct 2024 13:40:25 -0400 Subject: [PATCH] fix: pass system as args to wrappers --- outputs.nix | 2 +- wrappers/default.nix | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/outputs.nix b/outputs.nix index bde5cd5e..886da5bc 100644 --- a/outputs.nix +++ b/outputs.nix @@ -12,7 +12,7 @@ checks = set.map (_: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib; in { - inherit inputs tree std pkgs formatter lib checks; + inherit inputs tree std pkgs formatter lib checks wrappers; legacyPackages = pkgs; packages = pkgs // wrappers; } diff --git a/wrappers/default.nix b/wrappers/default.nix index d2088ae2..e5ec55bd 100644 --- a/wrappers/default.nix +++ b/wrappers/default.nix @@ -1,9 +1,10 @@ { inputs, ... -}@args: let -in - inputs.utils.lib.eachDefaultSystem (system: { - nf-actions-test = import ./nf-actions-test.nix args; - nf-generate = import ./nf-generate.nix args; +}@args: + inputs.utils.lib.eachDefaultSystem (system: let + newArgs = args // { inherit system; }; + in { + nf-actions-test = import ./nf-actions-test.nix newArgs; + nf-generate = import ./nf-generate.nix newArgs; }) \ No newline at end of file