From e463c62922ad09f016e4f1dd1d6d0cabccb0ff79 Mon Sep 17 00:00:00 2001
From: notgne2
Date: Sun, 11 Oct 2020 15:08:02 -0700
Subject: Move activate script location, use buildEnv for setActivate

---
 flake.nix       | 4 ++--
 src/activate.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 81603e4..73aa802 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
         };
 
         lib = {
-          setActivate = base: activate: pkgs.symlinkJoin {
+          setActivate = base: activate: pkgs.buildEnv {
             name = ("activatable-" + base.name);
             paths = [
               base
@@ -46,7 +46,7 @@
                   ${activate}
                 '';
                 executable = true;
-                destination = "/activate";
+                destination = "/deploy-rs-activate";
               })
             ];
           };
diff --git a/src/activate.rs b/src/activate.rs
index 64baa4f..38fc832 100644
--- a/src/activate.rs
+++ b/src/activate.rs
@@ -75,7 +75,7 @@ pub async fn activate(
         }
     }
 
-    let activate_status = Command::new(format!("{}/activate", profile_path))
+    let activate_status = Command::new(format!("{}/deploy-rs-activate", profile_path))
         .env("PROFILE", &profile_path)
         .status()
         .await;
@@ -142,7 +142,7 @@ pub async fn activate(
 
             info!("Attempting re-activate last generation");
 
-            let re_activate_exit_status = Command::new(format!("{}/activate", profile_path))
+            let re_activate_exit_status = Command::new(format!("{}/deploy-rs-activate", profile_path))
                 .env("PROFILE", &profile_path)
                 .status()
                 .await?;
-- 
cgit v1.2.3