Merge pull request #90 from serokell/balsoft/fix-rollback

Fix auto-rollback with dry_activate

1 files changed, 3 insertions, 7 deletions

diff --git a/flake.nix b/flake.nix
index bc1ebc6..d985db3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,13 +73,9 @@
                             #!${pkgs.runtimeShell}
                             set -euo pipefail
 
-                            if [[ $DRY_ACTIVATE == "1" ]]
+                            if [[ "''${DRY_ACTIVATE:-}" == "1" ]]
                             then
-                                ${if builtins.hasAttr "dryActivate" customSelf
-                                  then
-                                    customSelf.dryActivate
-                                  else
-                                    "echo ${pkgs.writeScript "activate" activate}"}
+                                ${customSelf.dryActivate or "echo ${pkgs.writeScript "activate" activate}"}
                             else
                                 ${activate}
                             fi
@@ -91,7 +87,7 @@
                             name = base.name + "-activate-rs";
                             text = ''
                             #!${pkgs.runtimeShell}
-                            exec ${self.defaultPackage."${system}"}/bin/activate "$@"
+                            exec ${self.defaultPackage.${system}}/bin/activate "$@"
                           '';
                           executable = true;
                           destination = "/activate-rs";