From d71827515a481991d934c5c786a6a75866b641da Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Thu, 27 Oct 2022 08:41:58 -0700 Subject: [PATCH] Resolve Linux issue with repeated installs not working Signed-off-by: Ana Hobden --- src/action/base/setup_default_profile.rs | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/action/base/setup_default_profile.rs b/src/action/base/setup_default_profile.rs index fa1c492..819b9e6 100644 --- a/src/action/base/setup_default_profile.rs +++ b/src/action/base/setup_default_profile.rs @@ -97,6 +97,8 @@ impl Action for SetupDefaultProfile { Command::new(nix_pkg.join("bin/nix-env")) .arg("-i") .arg(&nix_pkg) + .arg("-i") + .arg(&nss_ca_cert_pkg) .env( "HOME", dirs::home_dir().ok_or_else(|| SetupDefaultProfileError::NoRootHome.boxed())?, @@ -110,17 +112,17 @@ impl Action for SetupDefaultProfile { .map_err(|e| SetupDefaultProfileError::Command(e).boxed())?; // Install `nss-cacert` into the store - execute_command( - Command::new(nix_pkg.join("bin/nix-env")) - .arg("-i") - .arg(&nss_ca_cert_pkg) - .env( - "NIX_SSL_CERT_FILE", - nss_ca_cert_pkg.join("etc/ssl/certs/ca-bundle.crt"), - ), - ) - .await - .map_err(|e| SetupDefaultProfileError::Command(e).boxed())?; + // execute_command( + // Command::new(nix_pkg.join("bin/nix-env")) + // .arg("-i") + // .arg(&nss_ca_cert_pkg) + // .env( + // "NIX_SSL_CERT_FILE", + // nss_ca_cert_pkg.join("etc/ssl/certs/ca-bundle.crt"), + // ), + // ) + // .await + // .map_err(|e| SetupDefaultProfileError::Command(e).boxed())?; set_env( "NIX_SSL_CERT_FILE",