From e18dd92458575e113634e4c0879f6a5548357c4b Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 11 Sep 2020 17:51:59 +0200
Subject: [PATCH] Add wrapped Nim-compiler to buildPackages overlay

---
 flake.lock | 17 +++++++++++++++++
 flake.nix  | 14 ++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index 606bf12..f00d647 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "nim-nixpkgs": {
+      "locked": {
+        "lastModified": 1599826892,
+        "narHash": "sha256-HC8dzETkLmIEJh7VIYWBRl4D8SN7Vg2FAMxaWy52oOo=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5885021135ec04e9db30492bfceba6fa4da23329",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5885021135ec04e9db30492bfceba6fa4da23329",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1597134609,
@@ -18,6 +34,7 @@
     },
     "root": {
       "inputs": {
+        "nim-nixpkgs": "nim-nixpkgs",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index d08af5d..13633b9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,10 @@
   inputs.nixpkgs.url =
     "github:ehmry/nixpkgs/de1c8a039fb0f2564526633ddfe9498354a5154b";
 
-  outputs = { self, nixpkgs }:
+  inputs.nim-nixpkgs.url =
+    "github:NixOS/nixpkgs/5885021135ec04e9db30492bfceba6fa4da23329";
+
+  outputs = { self, nixpkgs, nim-nixpkgs }:
     let
       localSystems = [ "x86_64-linux" ];
       crossSystems = [ "aarch64-genode" "x86_64-genode" ];
@@ -47,7 +50,14 @@
               useLLVM = true;
             };
             config.allowUnsupportedSystem = true;
-            overlays = [ self.overlay ];
+            overlays = [
+              self.overlay
+              (prev: final: rec {
+                nim = final.callPackage
+                  "${nim-nixpkgs}/pkgs/development/compilers/nim" { };
+                nim-unwrapped = nim.unwrapped;
+              })
+            ];
           });
 
     in rec {