From 05c6934e6b38090cb88314c43e20486d03acbc4a Mon Sep 17 00:00:00 2001
From: crop <crop_tech@proton.me>
Date: Sun, 21 Jul 2024 20:15:55 +0200
Subject: [PATCH] Allow use of lix from nixpkgs

Change behaviour of module. Allow not specifying LixSrc
and provide fallback to nixpkgs.pkgs.lix
---
 module.nix  | 2 +-
 overlay.nix | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/module.nix b/module.nix
index 5e7f1bf..dcc7f01 100644
--- a/module.nix
+++ b/module.nix
@@ -1,4 +1,4 @@
-{ lix, versionSuffix ? "" }:
+{ lix ? null, versionSuffix ? "" }:
 { pkgs, config, ... }:
 {
   nixpkgs.overlays = [ (import ./overlay.nix { inherit lix versionSuffix; }) ];
diff --git a/overlay.nix b/overlay.nix
index ec76bb2..fa91dc5 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,11 +1,11 @@
-{ lix, versionSuffix ? "" }:
+{ lix ? null, versionSuffix ? "" }:
 final: prev:
 let
   # This is kind of scary to not override the nix version to pretend to be
   # 2.18 since nixpkgs can introduce new breakage in its Nix unstable CLI
   # usage.
   # https://github.com/nixos/nixpkgs/blob/6afb255d976f85f3359e4929abd6f5149c323a02/nixos/modules/config/nix.nix#L121
-  lixPkg = final.callPackage (lix + "/package.nix") ({
+  lixPkgFromSource = final.callPackage (lix + "/package.nix") ({
     versionSuffix = "-${versionSuffix}";
     # FIXME: do this more sensibly for future releases
     # https://git.lix.systems/lix-project/lix/issues/406
@@ -52,9 +52,11 @@ let
     # want to do that.
     lix-sources = import ./pins.nix;
 
+    lix = if lix != null then lixPkgFromSource else prev.lix;
+
     nixVersions = prev.nixVersions // rec {
       # FIXME: do something less scuffed
-      nix_2_18 = maybeWarnDuplicate lixPkg;
+      nix_2_18 = maybeWarnDuplicate final.lix;
       stable = nix_2_18;
       nix_2_18_upstream = prev.nixVersions.nix_2_18;
     };