From 459533000148413008460cc9adf02a87e2556ac8 Mon Sep 17 00:00:00 2001
From: Astavie <astavie@pm.me>
Date: Tue, 14 Mar 2023 20:06:37 +0100
Subject: [PATCH] remove flake-utils

---
 flake.lock |  5 ++---
 flake.nix  | 45 ++++++++++++++++++++++++---------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1385534..ba3aa7d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -31,9 +31,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
+        "id": "flake-utils",
+        "type": "indirect"
       }
     },
     "nixpkgs": {
diff --git a/flake.nix b/flake.nix
index 335b5d8..b9c7a5e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,20 +4,24 @@
   inputs.fenix.url = github:nix-community/fenix;
   inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";
 
-  inputs.flake-utils.url = github:numtide/flake-utils;
-
   outputs = { self, nixpkgs, fenix, flake-utils }:
-    flake-utils.lib.simpleFlake {
-      inherit self nixpkgs;
-      name = "stardust-xr";
-      systems = [ "x86_64-linux" "aarch64-linux" ];
+    let
+      name = "server";
+      pkgs = system: import nixpkgs {
+        inherit system;
+      };
+      shell = pkgs: pkgs.mkShell {
+        inputsFrom = [ self.packages.${pkgs.system}.default ];
 
-      overlay = pkgs: prev:
+        # ---- START package specific dev settings ----
+        LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
+        # ---- END package specific dev settings ----
+      };
+      package = pkgs:
         let
           toolchain = fenix.packages.${pkgs.system}.minimal.toolchain;
-
-          name = "server";
-          pkg = (pkgs.makeRustPlatform {
+        in
+          (pkgs.makeRustPlatform {
             cargo = toolchain;
             rustc = toolchain;
           }).buildRustPackage rec {
@@ -50,17 +54,16 @@
             LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
             # ---- END package specific settings ----
           };
-        in
-        {
-          stardust-xr.${name} = pkg;
-          stardust-xr.defaultPackage = pkg;
-        };
-      shell = { pkgs }: pkgs.mkShell {
-        inputsFrom = [ pkgs.stardust-xr.defaultPackage ];
-
-        # ---- START package specific dev settings ----
-        LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
-        # ---- END package specific dev settings ----
+    in
+    {
+      overlays.default = final: prev: {
+        stardust-xr.${name} = package final;
       };
+
+      packages."x86_64-linux".default = package (pkgs "x86_64-linux");
+      packages."aarch64-linux".default = package (pkgs "aarch64-linux");
+
+      devShells."x86_64-linux".default = shell (pkgs "x86_64-linux");
+      devShells."aarch64-linux".default = shell (pkgs "aarch64-linux");
     };
 }