From c0e7b6021d3350cdcba8541b8b1fe5f9a9381c25 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Sun, 08 Dec 2024 03:22:55 +0000 Subject: [PATCH] fix: differentiate between imported functor and just nixpkgs --- --- a/crates/fleet-base/src/opts.rs +++ b/crates/fleet-base/src/opts.rs @@ -210,9 +210,10 @@ let import = nix_go!(builtins_field.import); let overlays = nix_go!(config_field.nixpkgs.overlays); - let nixpkgs = nix_go!(config_field.nixpkgs.buildUsing | import); + let nixpkgs = nix_go!(config_field.nixpkgs.buildUsing); + let nixpkgs_imported = nix_go!(nixpkgs | import); - let default_pkgs = nix_go!(nixpkgs(Obj { + let default_pkgs = nix_go!(nixpkgs_imported(Obj { overlays, system: self.local_system.clone(), })); -- gitstuff