From a19a1fa394bec9d6bf1de85fd5be2ec4fb89ae83 Mon Sep 17 00:00:00 2001
From: Gaute Ravndal <gaute.ravndal@gmail.com>
Date: Fri, 2 Jan 2026 01:04:46 +0100
Subject: [PATCH] nixos/tests/fish: test nixos-env-preinit.fish

Fish 4.3.1 broke preinit, and with it `environment.variables` in a fresh
login shell.
---
 nixos/tests/fish.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/tests/fish.nix b/nixos/tests/fish.nix
index 36dfd6b373d9..a134bf1f68c1 100644
--- a/nixos/tests/fish.nix
+++ b/nixos/tests/fish.nix
@@ -24,6 +24,10 @@
       machine.succeed(
           "fish -ic 'echo $fish_complete_path' | grep -q '/share/fish/vendor_completions.d /etc/fish/generated_completions /root/.cache/fish/generated_completions$'"
       )
+      machine.wait_for_file("/etc/fish/nixos-env-preinit.fish")
+      machine.succeed(
+          "env -u __NIXOS_SET_ENVIRONMENT_DONE fish -lc 'set -q __NIXOS_SET_ENVIRONMENT_DONE'"
+      )
       machine.wait_for_file("/etc/fish/config.fish")
       config = machine.succeed("fish_indent -c /etc/fish/config.fish")
     '';