From 41f5b9f9c85216ffc58d70ef0e1fe378a70be2f3 Mon Sep 17 00:00:00 2001 From: GTrunSec Date: Tue, 2 Aug 2022 22:37:51 -0700 Subject: [PATCH] use realChannel instead --- src/mkFlake/fup-adapter.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mkFlake/fup-adapter.nix b/src/mkFlake/fup-adapter.nix index 19f76eb..eeebdd9 100644 --- a/src/mkFlake/fup-adapter.nix +++ b/src/mkFlake/fup-adapter.nix @@ -41,7 +41,13 @@ let }) ]; - unifyOverlays = channels: map (o: if builtins.isFunction (o null null) then o channels else o); + unifyOverlays = channels: + let + getChannel = inputs."${channelName}".legacyPackages."${system}"; + system = config.nixos.hostDefaults.system; + channelName = config.nixos.hostDefaults.channelName; + in + map (o: if builtins.isFunction (o getChannel getChannel) then o channels else o); stripChannel = channel: removeAttrs channel [ # arguments in our channels api that shouldn't be passed to fup