From 49e058f1cfbf315e9bcb664ef884e27eb48cacb5 Mon Sep 17 00:00:00 2001
From: Alexandre Thomas <alexandre.thomas@alice-bob.com>
Date: Tue, 3 Jan 2023 21:06:47 +0100
Subject: Fix Nix installation on older versions of fish

The `fish_add_path` function is only available for fish 3.2.0 or newer,
and not on older versions.
This commit adds an alternative way to update the PATH when
`fish_add_path` does not exist.
---
 scripts/nix-profile-daemon.fish.in | 18 ++++++++++++++++--
 scripts/nix-profile.fish.in        | 16 +++++++++++++++-
 2 files changed, 31 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/nix-profile-daemon.fish.in b/scripts/nix-profile-daemon.fish.in
index 3d587dd7f..400696812 100644
--- a/scripts/nix-profile-daemon.fish.in
+++ b/scripts/nix-profile-daemon.fish.in
@@ -1,3 +1,15 @@
+function add_path --argument-names new_path
+    if type -q fish_add_path
+        # fish 3.2.0 or newer
+	fish_add_path --prepend --global $new_path
+    else
+        # older versions of fish
+        if not contains $new_path $fish_user_paths
+            set --global fish_user_paths $new_path $fish_user_paths
+        end
+    end
+end
+
 # Only execute this file once per shell.
 if test -n "$__ETC_PROFILE_NIX_SOURCED"
   exit
@@ -31,5 +43,7 @@ else
   end
 end
 
-fish_add_path --prepend --global "@localstatedir@/nix/profiles/default/bin"
-fish_add_path --prepend --global "$HOME/.nix-profile/bin"
+add_path "@localstatedir@/nix/profiles/default/bin"
+add_path "$HOME/.nix-profile/bin"
+
+functions -e add_path
diff --git a/scripts/nix-profile.fish.in b/scripts/nix-profile.fish.in
index 8d783d7c0..731498c76 100644
--- a/scripts/nix-profile.fish.in
+++ b/scripts/nix-profile.fish.in
@@ -1,3 +1,15 @@
+function add_path --argument-names new_path
+    if type -q fish_add_path
+        # fish 3.2.0 or newer
+	fish_add_path --prepend --global $new_path
+    else
+        # older versions of fish
+        if not contains $new_path $fish_user_paths
+            set --global fish_user_paths $new_path $fish_user_paths
+        end
+    end
+end
+
 if test -n "$HOME" && test -n "$USER"
 
     # Set up the per-user profile.
@@ -32,6 +44,8 @@ if test -n "$HOME" && test -n "$USER"
       set --export --prepend --path MANPATH "$NIX_LINK/share/man"
     end
 
-    fish_add_path --prepend --global "$NIX_LINK/bin"
+    add_path "$NIX_LINK/bin"
     set --erase NIX_LINK
 end
+
+functions -e add_path
-- 
cgit v1.2.3