From 0a29d8368f0f479a60c535ee580719f9eb68d138 Mon Sep 17 00:00:00 2001 From: mcmah309 Date: Tue, 2 Jan 2024 02:27:49 -0500 Subject: [PATCH 1/2] fix: Fix conda-shell environment first creation issue --- pkgs/tools/package-management/conda/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index b20165a07861..6c346bc0e1f2 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -77,7 +77,11 @@ in export QTCOMPOSE=${xorg.libX11}/share/X11/locale export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so # Allows `conda activate` to work properly - source ${installationPath}/etc/profile.d/conda.sh + condaSh=${installationPath}/etc/profile.d/conda.sh + if [ ! -f $condaSh ]; then + conda-install + fi + source $condaSh ''; runScript = "bash -l"; From 8451baefee325a0e80a3f539c63b032af42f8595 Mon Sep 17 00:00:00 2001 From: mcmah309 Date: Tue, 2 Jan 2024 03:40:00 -0500 Subject: [PATCH 2/2] fix: Trailing whitespace --- pkgs/tools/package-management/conda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 6c346bc0e1f2..5638676838f7 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -78,7 +78,7 @@ in export LIBARCHIVE=${libarchive.lib}/lib/libarchive.so # Allows `conda activate` to work properly condaSh=${installationPath}/etc/profile.d/conda.sh - if [ ! -f $condaSh ]; then + if [ ! -f $condaSh ]; then conda-install fi source $condaSh