X-Git-Url: http://git.scottworley.com/auto-upgrade-with-pinch/blobdiff_plain/98604ba76ee41d5835d3f0d4ef76e7250d9f59c2..91b2b7c6c4873633718078d1ff5a775e21bf06f3:/modules/auto-upgrade.nix

diff --git a/modules/auto-upgrade.nix b/modules/auto-upgrade.nix
index f3089bd..46e3e7f 100644
--- a/modules/auto-upgrade.nix
+++ b/modules/auto-upgrade.nix
@@ -183,12 +183,16 @@ let
         # Build
         in_tmpdir hydrate ${config.system.build.nixos-rebuild}/bin/nixos-rebuild build
         while read user;do
-          hydrate /run/wrappers/bin/sudo -u "$user" -D / \
+          pushd /
+          hydrate /run/wrappers/bin/sudo -u "$user" \
             ${pkgs.nix}/bin/nix-build --no-out-link '<nixpkgs>' -A "$(userenv_query "$user" .package)"
+          popd
         done < <( config_query '.userEnvironments | keys []' )
+        sync
 
         # Install
         hydrate ${config.system.build.nixos-rebuild}/bin/nixos-rebuild switch
+        sync
         while read user;do
           remove_arg=-r
           if [[ "$(userenv_query "$user" .otherPackagesAction)" == keep ]];then
@@ -196,6 +200,7 @@ let
           fi
           hydrate /run/wrappers/bin/sudo -u "$user" \
             ${pkgs.nix}/bin/nix-env -f '<nixpkgs>' $remove_arg -iA "$(userenv_query "$user" .package)"
+          sync
         done < <( config_query '.userEnvironments | keys []' )
       ''
     }