From cb37c1f1e07fa55e983d73633c3a59e485d3329b Mon Sep 17 00:00:00 2001
From: Tony O <822863+bqv@users.noreply.github.com>
Date: Sat, 13 Jun 2020 17:49:05 +0100
Subject: [PATCH] Fix flake overlay attr

Fix flake overlay attr

Solves the following error:

while evaluating the attribute 'overlays.combined-eval-on-build' at /nix/store/0gg5rsi7nvwlk2ky1w595qyjgwpqj35g-source/flake.nix:11:5:
value is a function while a set was expected, at /nix/store/0gg5rsi7nvwlk2ky1w595qyjgwpqj35g-source/flake.nix:10:15
---
 flake.nix            | 2 +-
 overlays/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1af2b75948..3390c591e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,7 +7,7 @@
     # Using the eval-on-build version here as the plan is that
     # `builtins.currentSystem` will not be supported in flakes.
     # https://github.com/NixOS/rfcs/pull/49/files#diff-a5a138ca225433534de8d260f225fe31R429
-    overlay = self.overlays.combined-eval-on-build;
+    overlay = (self.overlays {}).combined-eval-on-build;
     overlays = import ./overlays;
     config = import ./config.nix;
     sources = import ./nixpkgs;
diff --git a/overlays/default.nix b/overlays/default.nix
index cde3aec5a0..82c1ffd2c0 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -53,4 +53,4 @@ let
     (ordered ++ [overlays.eval-on-current]);
   combined-eval-on-build = builtins.foldl' composeExtensions (_: _: { })
     (ordered ++ [overlays.eval-on-build]);
-in overlays // { inherit combined; }
+in overlays // { inherit combined combined-eval-on-build; }