From 6def4cc69ad9f1e54dcc6e2c2193c1088d85ab4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Wed, 25 Sep 2024 19:46:13 -0600
Subject: [PATCH] overlay: make finalNix depend on the nix version being used
 by a package

This should address both of the following (were 35 is more general and
36 a specific case)

- https://git.lix.systems/lix-project/nixos-module/issues/35
- https://git.lix.systems/lix-project/nixos-module/issues/36
---
 overlay.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/overlay.nix b/overlay.nix
index cbc9515..0993af7 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -60,11 +60,25 @@ let
   # errors. This is a simple safeguard to put in at least something that might be seen.
   maybeWarnWrongMajor = x: if !(lib.hasPrefix supportedLixMajor lixPackageToUse.version) then builtins.trace wrongMajorWarning x else x;
 
-  overlay = 
+  overlay =
     lib.genAttrs overridelist_upstream (
-      name: if (lib.functionArgs prev.${name}.override ? "nix") then prev.${name}.override {
-        nix = final.nixVersions.stable_upstream;
-      } else prev.${name}
+      name:
+      if (lib.functionArgs prev.${name}.override ? "nix") then
+        let
+          # Get the two common inputs of a derivation/package.
+          inputs = prev.${name}.buildInputs ++ prev.${name}.nativeBuildInputs;
+          nixDependency = lib.findFirst
+            (drv: drv.pname == "nix")
+            prev.nixVersions.stable_upstream # default to stable nix if nix is not an input
+            inputs;
+          nixMajor = lib.versions.major nixDependency.version;
+          nixMinor = lib.versions.minor nixDependency.version;
+          nixAttr = "nix_${nixMajor}_${nixMinor}";
+          finalNix = final.nixVersions.${nixAttr};
+        in
+        prev.${name}.override {
+          nix = finalNix;
+        } else prev.${name}
     ) // {
     lix-overlay-present = 1;
     # used for things that one wouldn't necessarily want to update, but we