From 0bb949a1e2ffa9f71abdcf11bb6c884d63d4ed97 Mon Sep 17 00:00:00 2001
From: xecarlox94 <jf94.uk@gmail.com>
Date: Thu, 29 May 2025 23:34:08 +0100
Subject: [PATCH] fixed overlay and templates

---
 flake.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/flake.nix b/flake.nix
index f4781f1..0f285d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,21 +24,23 @@
       gomod2nix,
       ...
     }:
+    let
+
+      # TODO: merge overlays into a list
+      # TODO: create default file in overlays folder to merge all overlays
+      bindingsOverlay = import ./nix/overlays/bindings.nix;
+      coreOverlay = (final: prev: {
+        p2prc = final.callPackage ./. { };
+      });
+
+    in
     (flake-utils.lib.eachDefaultSystem (system:
       let
 
-        # TODO: merge overlays into a list
-        # TODO: create default file in overlays folder to merge all overlays
-        bindingsOverlay = import ./nix/overlays/bindings.nix;
-        coreOverlay = (final: prev: {
-          p2prc = final.callPackage ./. { };
-        });
-
         # The current default sdk for macOS fails to compile go projects, so we use a newer one for now.
         # This has no effect on other platforms.
         callPackage = pkgs.darwin.apple_sdk_11_0.callPackage or pkgs.callPackage;
 
-
         pkgs = import nixpkgs {
           inherit system;
           overlays = [
@@ -64,15 +66,14 @@
           ];
         };
 
-        overlays = {
-          # TODO: merge all overlays into a single one
-          default = coreOverlay;
-          bindings = bindingsOverlay;
-        };
-
       }
     )) //
     {
+      overlays = {
+        # TODO: merge all overlays into a single one
+        default = coreOverlay;
+        bindings = bindingsOverlay;
+      };
       templates.haskell = {
         bindings = ./nix/templates/haskell;
         description = "Haskell Bindings to p2prc protocol";