From dc6bbe909ae52b8ef259fb4a2e8977d3961377bf Mon Sep 17 00:00:00 2001
From: r6915ee <astergthefourth@gmail.com>
Date: Tue, 16 Sep 2025 17:10:12 -0700
Subject: [PATCH 1/3] (Partially) refactor Nix shell configuration for new
 Codename setup

Codename has upgraded to Haxe 4.3.7 as the minimum recommended version,
and the repository has moved some files around. The Nix shell
configuration has been updated as a result.

Do note that this is only a partial refactor, due to changes on the
UNIX setup file being awaited, as a result of a bug. Alongside this,
although the game compiles normally using this commit's configuration,
the Nix shell configuration uses an outdated Haxe version (4.3.6),
due to 4.3.7 not being available in Nixpkgs at the moment.

An overlay is commented out of the configuration; the reason for this
is that although the download is fine, Nix will attempt to compile the
derivation by default, and Haxe does not appear to compile properly
using that overlay.
---
 shell.nix | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/shell.nix b/shell.nix
index 4cf3c006f..75ae0932f 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,9 +1,27 @@
-{ }:
+{
+  pkgs ? import <nixpkgs> {
+    overlays = [
+      (final: prev: {
+        # Haxe does not compile properly using the overlay
+        # below, due to an OCaml error. Do note that the patches
+        # have been removed as a result of an outdated patch.
+        #
+        # haxe = prev.haxe.overrideAttrs (old: {
+        #   version = "4.3.7";
+        #   src = prev.fetchgit {
+        #     url = "https://github.com/HaxeFoundation/haxe.git";
+        #     tag = "4.3.7";
+        #     hash = "sha256-sQb7MCoH2dZOvNmDQ9P0yFYrSXYOMn4FS/jlyjth39Y=";
+        #     fetchSubmodules = true;
+        #   };
+        #   patches = [ ];
+        # });
+      })
+    ];
+    config = { };
+  },
+}:
 let
-  pkgs = import (builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/archive/c407032be28ca2236f45c49cfb2b8b3885294f7f.tar.gz";
-  }) { };
-
   libs =
     with pkgs;
     [
@@ -37,6 +55,9 @@ pkgs.mkShell {
   LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
 
   shellHook = ''
-    source update.sh
+    cd building/
+    # The shell script does not work properly with
+    # Nix shells!
+    # source setup-unix.sh
   '';
 }

From 45f998cf74e6194e0b3a0bd7edbd8b68584b1adf Mon Sep 17 00:00:00 2001
From: r6915ee <astergthefourth@gmail.com>
Date: Sun, 21 Sep 2025 12:23:16 -0700
Subject: [PATCH 2/3] Use updated setup script directly in shell hook

---
 shell.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/shell.nix b/shell.nix
index 75ae0932f..6a957904e 100644
--- a/shell.nix
+++ b/shell.nix
@@ -55,9 +55,6 @@ pkgs.mkShell {
   LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath libs;
 
   shellHook = ''
-    cd building/
-    # The shell script does not work properly with
-    # Nix shells!
-    # source setup-unix.sh
+    ./building/setup-unix.sh
   '';
 }

From d3b1d6d77fdd4e0c35d1f8b01ad188f95dd3c1b1 Mon Sep 17 00:00:00 2001
From: r6915ee <astergthefourth@gmail.com>
Date: Sun, 21 Sep 2025 16:49:46 -0700
Subject: [PATCH 3/3] Update QTTools in Nix shell configuration

---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 6a957904e..6fb51c7d0 100644
--- a/shell.nix
+++ b/shell.nix
@@ -47,7 +47,7 @@ pkgs.mkShell {
   packages = with pkgs; [
     haxe
     neko
-    libsForQt5.qttools
+    kdePackages.qttools
   ];
 
   buildInputs = libs;