Skip to content
This repository was archived by the owner on Mar 24, 2024. It is now read-only.

Commit 4caaf0c

Browse files
committed
fix: unique arch-os combo in flake.nix
1 parent 53bf327 commit 4caaf0c

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

internal/flake/templates/flake.nix.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
};
2323

2424
outputs = { self, nixpkgs, home-manager, fleek, ... }@inputs: {
25-
{{ range .Config.Systems }}
26-
packages.{{ .Arch }}-{{ .OS }}.fleek = fleek.packages.{{ .Arch }}-{{ .OS }}.default;
25+
{{ range .Config.UniqueSystems }}
26+
packages.{{ . }}.fleek = fleek.packages.{{ . }}.default;
2727
{{ end }}
2828
# Available through 'home-manager --flake .#your-username@your-hostname'
2929
{{ $overlays := .Config.Overlays }}

internal/fleek/config.go

+16
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,22 @@ func isValueInList(value string, list []string) bool {
310310
return false
311311
}
312312

313+
func (c *Config) UniqueSystems() []string {
314+
var m = make(map[string]bool)
315+
var systems = []string{}
316+
317+
for _, sys := range c.Systems {
318+
syskey := sys.Arch + "-" + sys.OS
319+
if m[syskey] {
320+
continue
321+
}
322+
systems = append(systems, syskey)
323+
m[syskey] = true
324+
}
325+
return systems
326+
327+
}
328+
313329
func (c *Config) UserFlakeDir() string {
314330
home, _ := os.UserHomeDir()
315331
// if for some reason the flakedir key is

0 commit comments

Comments
 (0)