From b08d2e01732f347683bb47699c28610f372716e0 Mon Sep 17 00:00:00 2001
From: Benoit de Chezelles <benoit.dechezelles@gmail.com>
Date: Tue, 7 May 2024 19:21:29 +0200
Subject: [PATCH] chore(nix): Update refs to submodules & explain why this is
 needed

---
 nix/flake.lock | 12 ++++++------
 nix/flake.nix  | 16 ++++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/nix/flake.lock b/nix/flake.lock
index a25b957dc..612567f3f 100644
--- a/nix/flake.lock
+++ b/nix/flake.lock
@@ -30,25 +30,25 @@
       },
       "original": {
         "owner": "wez",
+        "ref": "VER-2-13-0",
         "repo": "freetype2",
-        "rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
         "type": "github"
       }
     },
     "harfbuzz": {
       "flake": false,
       "locked": {
-        "lastModified": 1677798343,
-        "narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=",
+        "lastModified": 1711722720,
+        "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=",
         "owner": "harfbuzz",
         "repo": "harfbuzz",
-        "rev": "60841e26187576bff477c1a09ee2ffe544844abc",
+        "rev": "63973005bc07aba599b47fdd4cf788647b601ccd",
         "type": "github"
       },
       "original": {
         "owner": "harfbuzz",
+        "ref": "8.4.0",
         "repo": "harfbuzz",
-        "rev": "60841e26187576bff477c1a09ee2ffe544844abc",
         "type": "github"
       }
     },
@@ -146,8 +146,8 @@
       },
       "original": {
         "owner": "madler",
+        "ref": "v1.2.11",
         "repo": "zlib",
-        "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
         "type": "github"
       }
     }
diff --git a/nix/flake.nix b/nix/flake.nix
index 58323ff02..f20ec8925 100644
--- a/nix/flake.nix
+++ b/nix/flake.nix
@@ -12,23 +12,27 @@
       };
     };
 
+    # NOTE: @2024-05 Nix flakes does not support getting git submodules of 'self'.
+    # refs:
+    # - https://discourse.nixos.org/t/get-nix-flake-to-include-git-submodule/30324
+    # - https://github.com/NixOS/nix/pull/7862
+    #
+    # ... In the meantime we kinda duplicate the dependencies here then replace the submodules with
+    # links to each repo in package sources.
     freetype2 = {
-      url = "github:wez/freetype2/de8b92dd7ec634e9e2b25ef534c54a3537555c11";
+      url = "github:wez/freetype2/VER-2-13-0";
       flake = false;
     };
-
     harfbuzz = {
-      url = "github:harfbuzz/harfbuzz/60841e26187576bff477c1a09ee2ffe544844abc";
+      url = "github:harfbuzz/harfbuzz/8.4.0";
       flake = false;
     };
-
     libpng = {
       url = "github:glennrp/libpng/8439534daa1d3a5705ba92e653eda9251246dd61";
       flake = false;
     };
-
     zlib = {
-      url = "github:madler/zlib/cacf7f1d4e3d44d871b605da3b647f07d718623f";
+      url = "github:madler/zlib/v1.2.11";
       flake = false;
     };
   };