From 212e0343b79dee0f7e8d3a1bbce98fe086fa2486 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Tue, 30 Nov 2021 22:17:50 +0100
Subject: [PATCH] Downgrade 0ad

---
 flake.lock | 29 +++++++++++++++++++++++++----
 flake.nix  |  7 ++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8c7ed3ff..f654f062 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,11 +57,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1629481132,
-        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "997f7efcb746a9c140ce1f13c72263189225f482",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
         "type": "github"
       },
       "original": {
@@ -113,7 +113,8 @@
         "emacs-overlay": "emacs-overlay",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "utils": "utils"
+        "utils": "utils",
+        "zeroad": "zeroad"
       }
     },
     "utils": {
@@ -134,6 +135,26 @@
         "repo": "flake-utils-plus",
         "type": "github"
       }
+    },
+    "zeroad": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1638306354,
+        "narHash": "sha256-BzDq1nLLFN1ycasFRWLsCZqWEf4AtxjseRgqzHPo+hQ=",
+        "owner": "chvp",
+        "repo": "0ad-flake",
+        "rev": "66d17f3368d5509162ffc1bc3cee0c4432f9f361",
+        "type": "github"
+      },
+      "original": {
+        "owner": "chvp",
+        "repo": "0ad-flake",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 30e6109d..fc5523c9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,9 +17,13 @@
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable-small";
     utils.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.3.1";
+    zeroad = {
+      url = "github:chvp/0ad-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = inputs@{ self, nixpkgs, accentor, agenix, emacs-overlay, home-manager, utils }:
+  outputs = inputs@{ self, nixpkgs, accentor, agenix, emacs-overlay, home-manager, zeroad, utils }:
     let
       customPackages = callPackage: {
         jdtls = callPackage ./packages/jdtls { };
@@ -33,6 +37,7 @@
         overlaysBuilder = _: [
           emacs-overlay.overlay
           (self: super: customPackages self.callPackage)
+          (self: super: { zeroad = zeroad.packages.x86_64-linux.zeroad; })
         ];
       };
       hostDefaults = {