Skip to content

Commit 62fba1d

Browse files
committed
put plugins back where they belong
1 parent 83ce0ca commit 62fba1d

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

flake.nix

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,6 @@
9494
let
9595
pkgs = import nixpkgs { system = "x86_64-linux"; };
9696
lib = pkgs.lib;
97-
98-
plugins =
99-
let
100-
pluginDirs = lib.remove "" (
101-
lib.mapAttrsToList (name: kind: if kind == "directory" then name else "") (
102-
builtins.readDir "${self}/plugins/"
103-
)
104-
);
105-
in
106-
lib.genAttrs pluginDirs (name: mkPlugin pkgs name "${self}/plugins/${name}");
10797
in
10898
rec {
10999
cli = mkCli pkgs;
@@ -114,11 +104,6 @@
114104
name = "msgscript-all-plugins";
115105
paths = lib.attrValues plugins;
116106
};
117-
};
118-
packages.aarch64-linux =
119-
let
120-
pkgs = import nixpkgs { system = "aarch64-linux"; };
121-
lib = pkgs.lib;
122107

123108
plugins =
124109
let
@@ -129,6 +114,11 @@
129114
);
130115
in
131116
lib.genAttrs pluginDirs (name: mkPlugin pkgs name "${self}/plugins/${name}");
117+
};
118+
packages.aarch64-linux =
119+
let
120+
pkgs = import nixpkgs { system = "aarch64-linux"; };
121+
lib = pkgs.lib;
132122
in
133123
rec {
134124
cli = mkCli "x86_64-linux";
@@ -139,6 +129,16 @@
139129
name = "msgscript-all-plugins";
140130
paths = lib.attrValues plugins;
141131
};
132+
133+
plugins =
134+
let
135+
pluginDirs = lib.remove "" (
136+
lib.mapAttrsToList (name: kind: if kind == "directory" then name else "") (
137+
builtins.readDir "${self}/plugins/"
138+
)
139+
);
140+
in
141+
lib.genAttrs pluginDirs (name: mkPlugin pkgs name "${self}/plugins/${name}");
142142
};
143143

144144
devShells.x86_64-linux.default =

0 commit comments

Comments
 (0)