From db611fc5ab5e426a425cd8ba7e0dd7b797492df6 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 19 May 2022 09:51:39 +0200
Subject: [PATCH] templates.multi-module: Use lib.mkFlake

---
 template/multi-module/flake.nix | 37 +++++++++++++++------------------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/template/multi-module/flake.nix b/template/multi-module/flake.nix
index eba8a28..ed20313 100644
--- a/template/multi-module/flake.nix
+++ b/template/multi-module/flake.nix
@@ -8,26 +8,23 @@
   };
 
   outputs = { self, flake-modules-core, ... }:
-    (flake-modules-core.lib.evalFlakeModule
-      { inherit self; }
-      {
-        imports = [
-          ./hello/flake-module.nix
-        ];
-        systems = [ "x86_64-linux" "aarch64-darwin" ];
-        perSystem = system: { config, self', inputs', ... }: {
-          # Per-system attributes can be defined here. The self' and inputs'
-          # module parameters provide easy access to attributes of the same
-          # system.
+    flake-modules-core.lib.mkFlake { inherit self; } {
+      imports = [
+        ./hello/flake-module.nix
+      ];
+      systems = [ "x86_64-linux" "aarch64-darwin" ];
+      perSystem = system: { config, self', inputs', ... }: {
+        # Per-system attributes can be defined here. The self' and inputs'
+        # module parameters provide easy access to attributes of the same
+        # system.
 
-          packages.figlet = inputs'.nixpkgs.legacyPackages.figlet;
-        };
-        flake = {
-          # The usual flake attributes can be defined here, including system-
-          # agnostic ones like nixosModule and system-enumerating ones, although
-          # those are more easily expressed in perSystem.
+        packages.figlet = inputs'.nixpkgs.legacyPackages.figlet;
+      };
+      flake = {
+        # The usual flake attributes can be defined here, including system-
+        # agnostic ones like nixosModule and system-enumerating ones, although
+        # those are more easily expressed in perSystem.
 
-        };
-      }
-    ).config.flake;
+      };
+    };
 }