From e980d0e0e216f527ea73cfd12c7b019eceffa7f1 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Sun, 13 Apr 2025 20:22:31 -0700 Subject: [PATCH] nh: support 4.0 for flake option (#6818) Recently switched from FLAKE to NH_FLAKE in 4.0 --- modules/programs/nh.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/programs/nh.nix b/modules/programs/nh.nix index 86422dc21..ff4fc55b7 100644 --- a/modules/programs/nh.nix +++ b/modules/programs/nh.nix @@ -69,7 +69,13 @@ in home = lib.mkIf cfg.enable { packages = [ cfg.package ]; - sessionVariables = lib.mkIf (cfg.flake != null) { FLAKE = cfg.flake; }; + sessionVariables = lib.mkIf (cfg.flake != null) ( + let + packageVersion = lib.getVersion cfg.package; + isVersion4OrHigher = lib.versionAtLeast packageVersion "4.0.0"; + in + if isVersion4OrHigher then { NH_FLAKE = cfg.flake; } else { FLAKE = cfg.flake; } + ); }; systemd.user = lib.mkIf cfg.clean.enable {