diff --git a/third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch b/third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch new file mode 100644 index 000000000..d05e925ff --- /dev/null +++ b/third_party/overlays/patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch @@ -0,0 +1,32 @@ +From 949776a927faf69887ba71eb339762381e90e105 Mon Sep 17 00:00:00 2001 +From: Vincent Ambo +Date: Fri, 21 Feb 2025 17:45:23 +0300 +Subject: [PATCH] home-environment: fix compatibility with Nix 2.3 + +--- + modules/home-environment.nix | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/home-environment.nix b/modules/home-environment.nix +index fffb3b1c..d12f143a 100644 +--- a/modules/home-environment.nix ++++ b/modules/home-environment.nix +@@ -728,13 +728,13 @@ in + + # Create a temporary GC root to prevent collection during activation. + trap 'run rm -f $VERBOSE_ARG "$newGenGcPath"' EXIT +- run --silence nix-store --realise "$newGenPath" --add-root "$newGenGcPath" ++ run --quiet nix-store --realise "$newGenPath" --add-root "$newGenGcPath" --indirect + + ${activationCmds} + + ${optionalString (!config.uninstall) '' + # Create the "current generation" GC root. +- run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath" ++ run --silence nix-store --realise "$newGenPath" --add-root "$currentGenGcPath" --indirect + + if [[ -e "$legacyGenGcPath" ]]; then + run rm $VERBOSE_ARG "$legacyGenGcPath" +-- +2.47.2 + diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index fa59da370..b8fbd39d5 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -29,6 +29,7 @@ depot.nix.readTree.drvTargets { home-manager = super.home-manager.overrideAttrs (_: { src = depot.third_party.sources.home-manager; + patches = [ ./patches/0001-home-environment-fix-compatibility-with-Nix-2.3.patch ]; version = "git-" + builtins.substring 0 7 depot.third_party.sources.home-manager.rev; });