From 3e42035fc013ed4d8af6ee8dc0079c0c551c45a5 Mon Sep 17 00:00:00 2001 From: Bikal Lem <315907+bikallem@users.noreply.github.com> Date: Sun, 15 Jan 2023 20:48:02 +0000 Subject: [PATCH] opam: fix enableFishIntegration (#3597) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fish shell doesn't require arguments to `eval` to be double quoted like in a bash shell. At the moment doing so gives us the following error: ~/.config/fish/config.fish (line 12): $(...) is not supported. In fish, please use '(/nix/store/8asq…)'. eval "$(/nix/store/8asqgnhs89wzyjvs8p1n5hvxn7lkn9wa-opam-2.1.3/bin/opam env --shell=fish)" ^ from sourcing file ~/.config/fish/config.fish called during startup source: Error while reading file “/home/user/.config/fish/config.fish” This commit fixes the above error. --- modules/programs/opam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/opam.nix b/modules/programs/opam.nix index 2916fb19..0606d35b 100644 --- a/modules/programs/opam.nix +++ b/modules/programs/opam.nix @@ -56,7 +56,7 @@ in { ''; programs.fish.shellInit = mkIf cfg.enableFishIntegration '' - eval "$(${cfg.package}/bin/opam env --shell=fish)" + eval (${cfg.package}/bin/opam env --shell=fish) ''; }; }