From 40601ea3abdbf8923a63c69d974dd519fe34c532 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 12 Mar 2025 22:11:32 +0300 Subject: [PATCH] flake: don't override nix-prefetch-git when we don't need to https://github.com/NixOS/nixpkgs/pull/384099 has landed. Change-Id: Ic4034dcd3028f7f8e476bf436dd9e1cf174060c5 --- flake.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8d0d062fb..31548a6ea 100644 --- a/flake.nix +++ b/flake.nix @@ -205,9 +205,11 @@ # lix -> Rust stuff -> fetchCargoVendor -> nix-prefetch-git -> nix (lix) # This will eventually become a problem upstream, but until then, # apply some duct tape and pray. - nix-prefetch-git = prev.nix-prefetch-git.override { - nix = prev.nix; - }; + nix-prefetch-git = + if (lib.functionArgs prev.nix-prefetch-git.override) ? "nix" then + prev.nix-prefetch-git.override { nix = prev.nix; } + else + prev.nix-prefetch-git; # Export the patched version of boehmgc that Lix uses into the overlay # for consumers of this flake.