From 29f9fb52b37733720cd0f102f9cb968cc4e3e059 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 14 Jan 2018 22:02:27 +0100
Subject: [PATCH] activation-scripts: include system in PATH

This makes rollback more reliable by using the same version of tools
that where used previously. For example nix is used during the
activation checks.
---
 modules/system/activation-scripts.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/system/activation-scripts.nix b/modules/system/activation-scripts.nix
index 8b873e7..b868b0c 100644
--- a/modules/system/activation-scripts.nix
+++ b/modules/system/activation-scripts.nix
@@ -40,7 +40,7 @@ in
       #! ${stdenv.shell}
       set -e
       set -o pipefail
-      export PATH=${pkgs.coreutils}/bin:${config.environment.systemPath}
+      export PATH=${pkgs.coreutils}/bin:@out@/sw/bin:${config.environment.systemPath}
 
       systemConfig=@out@
 
@@ -82,7 +82,7 @@ in
       #! ${stdenv.shell}
       set -e
       set -o pipefail
-      export PATH=${pkgs.coreutils}/bin:${config.environment.systemPath}
+      export PATH=${pkgs.coreutils}/bin:@out@/sw/bin:${config.environment.systemPath}
 
       systemConfig=@out@