Unify the overlay creation logic

2024-05-11 01:07:26 +02:00 · 2024-05-11 01:07:26 +02:00 · 90c7cb0d98
commit 90c7cb0d98
parent 6c4190296f
1 changed files with 11 additions and 11 deletions
--- a/flake.nix
+++ b/flake.nix
@ -131,17 +131,17 @@
      ) // {
        overlays.default =
          final: prev: (
-            {
-              linuxPackages_latest.xone = packageDefinitions.xone final;
-            } //
-            (lib.attrsets.concatMapAttrs (
-              name: package:
+            lib.attrsets.concatMapAttrs (
+              name: packageDefinition:
+                let
+                  package = final.callPackage packageDefinition { };
+                in
                  if name == "xone"
-                then {}
-                else {
-                  ${name} = package final;
-                })
-              packageDefinitions));
+                  then
+                    { linuxPackages_latest.xone = package; }
+                  else
+                    { ${name} = package; })
+              packageDefinitions);

        nixosConfigurations =
            builtins.mapAttrs (