From 868550d8002c6a5c23d5b30ece0cf2c4d6a6d11f Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Sun, 7 Jul 2024 21:29:07 -0400
Subject: [PATCH] flake.nix: add custom nix-minecraft overlay

This overlay combines the upstream flake overlay with the overlay of my
custom fork. All server packages except Quilt will use the upstream
package definition, while Quilt server packages will use my fork.
---
 flake.lock | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 flake.nix  | 21 ++++++++++++--
 2 files changed, 95 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 132ac57..f195f59 100644
--- a/flake.lock
+++ b/flake.lock
@@ -176,6 +176,22 @@
       }
     },
     "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
       "flake": false,
       "locked": {
         "lastModified": 1696426674,
@@ -191,7 +207,7 @@
         "type": "github"
       }
     },
-    "flake-compat_3": {
+    "flake-compat_4": {
       "flake": false,
       "locked": {
         "lastModified": 1673956053,
@@ -229,6 +245,24 @@
       "inputs": {
         "systems": "systems_6"
       },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_7"
+      },
       "locked": {
         "lastModified": 1710146030,
         "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@@ -621,10 +655,32 @@
         "type": "github"
       }
     },
-    "nix-wsl": {
+    "nix-minecraft-upstream": {
       "inputs": {
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1720316340,
+        "narHash": "sha256-BJ3O2bsN0eeDFx/ooj0dnmgJyq+Ms5IRrHA9y+BWnNI=",
+        "owner": "infinidoge",
+        "repo": "nix-minecraft",
+        "rev": "30d6b1b7a7d8be89c924a1da9ce9a95a220d5494",
+        "type": "github"
+      },
+      "original": {
+        "owner": "infinidoge",
+        "repo": "nix-minecraft",
+        "type": "github"
+      }
+    },
+    "nix-wsl": {
+      "inputs": {
+        "flake-compat": "flake-compat_3",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -757,6 +813,7 @@
         "impermanence": "impermanence",
         "nix-index-database": "nix-index-database",
         "nix-minecraft": "nix-minecraft",
+        "nix-minecraft-upstream": "nix-minecraft-upstream",
         "nix-wsl": "nix-wsl",
         "nixfiles-assets": "nixfiles-assets",
         "nixpkgs": "nixpkgs_2",
@@ -765,7 +822,7 @@
         "pkg-android-tools": "pkg-android-tools",
         "rust-overlay": "rust-overlay",
         "stylix": "stylix",
-        "systems": "systems_7"
+        "systems": "systems_8"
       }
     },
     "rust-overlay": {
@@ -797,7 +854,7 @@
         "base16-kitty": "base16-kitty",
         "base16-tmux": "base16-tmux",
         "base16-vim": "base16-vim",
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "gnome-shell": "gnome-shell",
         "home-manager": [
           "home-manager"
@@ -926,6 +983,21 @@
         "type": "github"
       }
     },
+    "systems_8": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "xdph": {
       "inputs": {
         "hyprland-protocols": "hyprland-protocols",
diff --git a/flake.nix b/flake.nix
index 472ad7b..820134a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,11 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
+    nix-minecraft-upstream = {
+      url = "github:infinidoge/nix-minecraft";
+      inputs.nixpkgs.follows = "nixpkgs-unstable";
+    };
+
     # provides an up-to-date database for comma
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
@@ -89,7 +94,19 @@
     lib = nixpkgs.lib;
     systems = [ "x86_64-linux" "aarch64-linux" ];
 
-    overlays = [
+    overlays = let
+      nix-minecraft-patched-overlay = let
+        normal = inputs.nix-minecraft-upstream.overlays.default;
+        quilt = inputs.nix-minecraft.overlays.default;
+      in lib.composeExtensions
+        normal
+        (final: prev: let
+          x=quilt final prev;
+        in {
+          inherit (x) quiltServers quilt-server;
+          minecraftServers = prev.minecraftServers // x.quiltServers;
+        });
+    in [
       /* android-tools 33.0.3p2 */ (final: prev: {
         inherit (inputs.pkg-android-tools.legacyPackages.${final.system})
           android-tools android-udev-rules;
@@ -110,7 +127,7 @@
       inputs.hyprwm-contrib.overlays.default
       inputs.rust-overlay.overlays.default
       inputs.nixfiles-assets.overlays.default
-      inputs.nix-minecraft.overlays.default
+      nix-minecraft-patched-overlay
       # inputs.hypridle.overlays.default
       (final: prev: { inherit (inputs.hypridle.packages.${prev.system}) hypridle; })
     ];