From 09cf6ce70c0a1afab457928b3625f1f557f8c341 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 29 Oct 2011 21:03:57 +0000
Subject: [PATCH] find modules | fgrep .nix | fgrep -v .svn | fgrep -v
 nixpkgs.nix | xargs sed -i -e
 's|/nix/var|${config.nixpkgs.config.nix.stateDir}|g' -e
 's|/nix/store|${config.nixpkgs.config.nix.storeDir}|g'

Don't assume /nix/store or /nix/var in NixOS modules, this is configurable

svn path=/nixos/trunk/; revision=30104
---
 modules/config/fonts.nix                      |  4 +--
 modules/config/system-path.nix                |  2 +-
 modules/installer/cd-dvd/iso-image.nix        | 14 ++++----
 modules/installer/cd-dvd/system-tarball.nix   |  2 +-
 .../generations-dir/generations-dir.nix       |  2 +-
 .../tools/nixos-deploy-network/deploy.nix     | 14 ++++----
 modules/security/setuid-wrappers.nix          |  2 +-
 modules/services/misc/nix-daemon.nix          | 32 +++++++++----------
 modules/services/monitoring/ups.nix           |  2 +-
 modules/services/networking/openvpn.nix       |  2 +-
 modules/services/networking/ssh/lshd.nix      |  2 +-
 modules/services/system/dbus.nix              |  2 +-
 .../web-servers/apache-httpd/default.nix      |  2 +-
 .../services/web-servers/jboss/default.nix    |  4 +--
 .../system/activation/activation-script.nix   |  2 +-
 modules/system/boot/stage-1.nix               |  2 +-
 modules/system/etc/etc.nix                    |  2 +-
 modules/system/upstart-events/shutdown.nix    |  2 +-
 modules/virtualisation/amazon-image.nix       |  6 ++--
 modules/virtualisation/nova-image.nix         |  6 ++--
 modules/virtualisation/qemu-vm.nix            |  8 ++---
 21 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/modules/config/fonts.nix b/modules/config/fonts.nix
index 3516ed75ab61..653400c7e480 100644
--- a/modules/config/fonts.nix
+++ b/modules/config/fonts.nix
@@ -50,8 +50,8 @@ let
           "~/.nix-profile/lib/X11/fonts"
           "~/.nix-profile/share/fonts"
           # - the default profile
-          "/nix/var/nix/profiles/default/lib/X11/fonts"
-          "/nix/var/nix/profiles/default/share/fonts"
+          "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/lib/X11/fonts"
+          "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/share/fonts"
         ];
         description = "
           List of primary font paths.
diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 286f7993f77c..afdc65858a1b 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -69,7 +69,7 @@ let
           automatically updated every time you rebuild the system
           configuration.  (The latter is the main difference with
           installing them in the default profile,
-          <filename>/nix/var/nix/profiles/default</filename>.
+          <filename>${config.nixpkgs.config.nix.stateDir}/nix/profiles/default</filename>.
         '';
       };
 
diff --git a/modules/installer/cd-dvd/iso-image.nix b/modules/installer/cd-dvd/iso-image.nix
index daeebde76cf5..004cff6eb459 100644
--- a/modules/installer/cd-dvd/iso-image.nix
+++ b/modules/installer/cd-dvd/iso-image.nix
@@ -143,7 +143,7 @@ in
     [ { mountPoint = "/";
         device = "/dev/root";
       }
-      { mountPoint = "/nix/store";
+      { mountPoint = "${config.nixpkgs.config.nix.storeDir}";
         fsType = "squashfs";
         device = "/nix-store.squashfs";
         options = "loop";
@@ -169,7 +169,7 @@ in
   boot.initrd.kernelModules = [ "loop" ];
 
   # In stage 1, mount a tmpfs on top of / (the ISO image) and
-  # /nix/store (the squashfs image) to make this a live CD.
+  # ${config.nixpkgs.config.nix.storeDir} (the squashfs image) to make this a live CD.
   boot.initrd.postMountCommands =
     ''
       mkdir /mnt-root-tmpfs
@@ -180,8 +180,8 @@ in
 
       mkdir /mnt-store-tmpfs
       mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-      mkdir -p $targetRoot/nix/store
-      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root/nix/store=ro none /mnt-root-union/nix/store
+      mkdir -p $targetRoot${config.nixpkgs.config.nix.storeDir}
+      mount -t aufs -o dirs=/mnt-store-tmpfs=rw:/mnt-root${config.nixpkgs.config.nix.storeDir}=ro none /mnt-root-union${config.nixpkgs.config.nix.storeDir}
     '';
 
   # Closures to be copied to the Nix store on the CD, namely the init
@@ -223,7 +223,7 @@ in
       }
       { # Quick hack: need a mount point for the store.
         source = pkgs.runCommand "empty" {} "ensureDir $out";
-        target = "/nix/store";
+        target = "${config.nixpkgs.config.nix.storeDir}";
       }
     ];
 
@@ -257,11 +257,11 @@ in
     ''
       # After booting, register the contents of the Nix store on the
       # CD in the Nix database in the tmpfs.
-      ${config.environment.nix}/bin/nix-store --load-db < /nix/store/nix-path-registration
+      ${config.environment.nix}/bin/nix-store --load-db < ${config.nixpkgs.config.nix.storeDir}/nix-path-registration
 
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set /var/run/current-system
     '';
 }
diff --git a/modules/installer/cd-dvd/system-tarball.nix b/modules/installer/cd-dvd/system-tarball.nix
index daffb94bc532..f6753494d6e7 100644
--- a/modules/installer/cd-dvd/system-tarball.nix
+++ b/modules/installer/cd-dvd/system-tarball.nix
@@ -87,6 +87,6 @@ in
       # nixos-rebuild also requires a "system" profile and an
       # /etc/NIXOS tag.
       touch /etc/NIXOS
-      ${config.environment.nix}/bin/nix-env -p /nix/var/nix/profiles/system --set /var/run/current-system
+      ${config.environment.nix}/bin/nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set /var/run/current-system
     '';
 }
diff --git a/modules/installer/generations-dir/generations-dir.nix b/modules/installer/generations-dir/generations-dir.nix
index db9fa32c55a9..87d1fccedbc7 100644
--- a/modules/installer/generations-dir/generations-dir.nix
+++ b/modules/installer/generations-dir/generations-dir.nix
@@ -31,7 +31,7 @@ let
             default = false;
             description = "
               Whether copy the necessary boot files into /boot, so
-              /nix/store is not needed by the boot loadear.
+              ${config.nixpkgs.config.nix.storeDir} is not needed by the boot loadear.
             ";
           };
         };
diff --git a/modules/installer/tools/nixos-deploy-network/deploy.nix b/modules/installer/tools/nixos-deploy-network/deploy.nix
index 7ece202a990c..e94060101f5d 100644
--- a/modules/installer/tools/nixos-deploy-network/deploy.nix
+++ b/modules/installer/tools/nixos-deploy-network/deploy.nix
@@ -22,8 +22,8 @@ let
       ''
         if [ "$rollback" != "$succeeded" ]
 	then
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch
 
 	    rollback=$((rollback + 1))
 	fi
@@ -50,12 +50,12 @@ let
       in
       ''
         echo "=== activating system configuration on ${getAttr targetProperty (config.deployment)} ==="
-	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} ||
-	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback; rollbackSucceeded)
+	ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel} ||
+	  (ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback; rollbackSucceeded)
 
-        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch ||
-	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p /nix/var/nix/profiles/system --rollback
-	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} /nix/var/nix/profiles/system/bin/switch-to-configuration switch
+        ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch ||
+	  ( ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} nix-env -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --rollback
+	    ssh $NIX_SSHOPTS ${getAttr targetProperty (config.deployment)} ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system/bin/switch-to-configuration switch
 	    rollbackSucceeded
 	  )
 
diff --git a/modules/security/setuid-wrappers.nix b/modules/security/setuid-wrappers.nix
index ebd9e1ed537a..812179d4efc6 100644
--- a/modules/security/setuid-wrappers.nix
+++ b/modules/security/setuid-wrappers.nix
@@ -100,7 +100,7 @@ in
             if test -z "$source"; then
                 # If we can't find the program, fall back to the
                 # system profile.
-                source=/nix/var/nix/profiles/default/bin/${program}
+                source=${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/bin/${program}
             fi
 
             cp ${setuidWrapper}/bin/setuid-wrapper ${wrapperDir}/${program}
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index 221ad6e1f543..4539680cbe0d 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -308,26 +308,26 @@ in
         # Set up Nix.
         mkdir -p /nix/etc/nix
         ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
-        chown root.nixbld /nix/store
-        chmod 1775 /nix/store
+        chown root.nixbld ${config.nixpkgs.config.nix.storeDir}
+        chmod 1775 ${config.nixpkgs.config.nix.storeDir}
 
         # Nix initialisation.
         mkdir -m 0755 -p \
-          /nix/var/nix/gcroots \
-          /nix/var/nix/temproots \
-          /nix/var/nix/manifests \
-          /nix/var/nix/userpool \
-          /nix/var/nix/profiles \
-          /nix/var/nix/db \
-          /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache \
-          /nix/var/nix/chroots
-        mkdir -m 1777 -p /nix/var/nix/gcroots/per-user
-        mkdir -m 1777 -p /nix/var/nix/profiles/per-user
-        mkdir -m 1777 -p /nix/var/nix/gcroots/tmp
+          ${config.nixpkgs.config.nix.stateDir}/nix/gcroots \
+          ${config.nixpkgs.config.nix.stateDir}/nix/temproots \
+          ${config.nixpkgs.config.nix.stateDir}/nix/manifests \
+          ${config.nixpkgs.config.nix.stateDir}/nix/userpool \
+          ${config.nixpkgs.config.nix.stateDir}/nix/profiles \
+          ${config.nixpkgs.config.nix.stateDir}/nix/db \
+          ${config.nixpkgs.config.nix.stateDir}/log/nix/drvs \
+          ${config.nixpkgs.config.nix.stateDir}/nix/channel-cache \
+          ${config.nixpkgs.config.nix.stateDir}/nix/chroots
+        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/per-user
+        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/per-user
+        mkdir -m 1777 -p ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/tmp
 
-        ln -sf /nix/var/nix/profiles /nix/var/nix/gcroots/
-        ln -sf /nix/var/nix/manifests /nix/var/nix/gcroots/
+        ln -sf ${config.nixpkgs.config.nix.stateDir}/nix/profiles ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/
+        ln -sf ${config.nixpkgs.config.nix.stateDir}/nix/manifests ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/
       '';
 
   };
diff --git a/modules/services/monitoring/ups.nix b/modules/services/monitoring/ups.nix
index 2874bbf20875..10531a28865a 100644
--- a/modules/services/monitoring/ups.nix
+++ b/modules/services/monitoring/ups.nix
@@ -13,7 +13,7 @@ let
   {
     options = {
       # This can be infered from the UPS model by looking at
-      # /nix/store/nut/share/driver.list
+      # ${config.nixpkgs.config.nix.storeDir}/nut/share/driver.list
       driver = mkOption {
         type = types.uniq types.string;
         description = ''
diff --git a/modules/services/networking/openvpn.nix b/modules/services/networking/openvpn.nix
index bec5d7b8107e..580328d0de77 100644
--- a/modules/services/networking/openvpn.nix
+++ b/modules/services/networking/openvpn.nix
@@ -133,7 +133,7 @@ in
 
           Additionally you can specify the up/ down scripts by setting
           the up down properties.
-          Config lines up=/nix/store/xxx-up-script down=...
+          Config lines up=${config.nixpkgs.config.nix.storeDir}/xxx-up-script down=...
           will be appended to your configuration file automatically
 
           If you define at least one of up/down "script-security 2" will be
diff --git a/modules/services/networking/ssh/lshd.nix b/modules/services/networking/ssh/lshd.nix
index d32fabbde24b..b4f64e4b7cce 100644
--- a/modules/services/networking/ssh/lshd.nix
+++ b/modules/services/networking/ssh/lshd.nix
@@ -78,7 +78,7 @@ in
           If non-null, override the default login shell with the
           specified value.
         '';
-        example = "/nix/store/xyz-bash-10.0/bin/bash10";
+        example = "${config.nixpkgs.config.nix.storeDir}/xyz-bash-10.0/bin/bash10";
       };
 
       srpKeyExchange = mkOption {
diff --git a/modules/services/system/dbus.nix b/modules/services/system/dbus.nix
index 4f6d577e9369..2499ffc58e38 100644
--- a/modules/services/system/dbus.nix
+++ b/modules/services/system/dbus.nix
@@ -155,7 +155,7 @@ in
       };
 
     services.dbus.packages =
-      [ "/nix/var/nix/profiles/default"
+      [ "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default"
         config.system.path
       ];
 
diff --git a/modules/services/web-servers/apache-httpd/default.nix b/modules/services/web-servers/apache-httpd/default.nix
index 4894276e1d39..b2a1379527ad 100644
--- a/modules/services/web-servers/apache-httpd/default.nix
+++ b/modules/services/web-servers/apache-httpd/default.nix
@@ -339,7 +339,7 @@ let
     # But do allow access to files in the store so that we don't have
     # to generate <Directory> clauses for every generated file that we
     # want to serve.
-    <Directory /nix/store>
+    <Directory ${config.nixpkgs.config.nix.storeDir}>
         Order allow,deny
         Allow from all
     </Directory>
diff --git a/modules/services/web-servers/jboss/default.nix b/modules/services/web-servers/jboss/default.nix
index e1bcede6563c..85010bdbe78f 100644
--- a/modules/services/web-servers/jboss/default.nix
+++ b/modules/services/web-servers/jboss/default.nix
@@ -45,11 +45,11 @@ in
 
       deployDir = mkOption {
         description = "Location of the deployment files";
-        default = "/nix/var/nix/profiles/default/server/default/deploy/";
+        default = "${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/server/default/deploy/";
       };
 
       libUrl = mkOption {
-        default = "file:///nix/var/nix/profiles/default/server/default/lib";
+        default = "file://${config.nixpkgs.config.nix.stateDir}/nix/profiles/default/server/default/lib";
         description = "Location where the shared library JARs are stored";
       };
 
diff --git a/modules/system/activation/activation-script.nix b/modules/system/activation/activation-script.nix
index 72566507eccd..26706d6a20e8 100644
--- a/modules/system/activation/activation-script.nix
+++ b/modules/system/activation/activation-script.nix
@@ -76,7 +76,7 @@ in
             ln -sfn "$(readlink -f "$systemConfig")" /var/run/current-system
 
             # Prevent the current configuration from being garbage-collected.
-            ln -sfn /var/run/current-system /nix/var/nix/gcroots/current-system
+            ln -sfn /var/run/current-system ${config.nixpkgs.config.nix.stateDir}/nix/gcroots/current-system
           '';
       };
 
diff --git a/modules/system/boot/stage-1.nix b/modules/system/boot/stage-1.nix
index 08cf948fea4f..7f35b861352c 100644
--- a/modules/system/boot/stage-1.nix
+++ b/modules/system/boot/stage-1.nix
@@ -217,7 +217,7 @@ let
 
 
   # The initrd only has to mount / or any FS marked as necessary for
-  # booting (such as the FS containing /nix/store, or an FS needed for
+  # booting (such as the FS containing ${config.nixpkgs.config.nix.storeDir}, or an FS needed for
   # mounting /, like / on a loopback).
   fileSystems = filter
     (fs: fs.mountPoint == "/" || fs.neededForBoot)
diff --git a/modules/system/etc/etc.nix b/modules/system/etc/etc.nix
index c84d96829f33..f76c70c2f9fb 100644
--- a/modules/system/etc/etc.nix
+++ b/modules/system/etc/etc.nix
@@ -10,7 +10,7 @@ let
     environment.etc = mkOption {
       default = [];
       example = [
-        { source = "/nix/store/.../etc/dir/file.conf.example";
+        { source = "${config.nixpkgs.config.nix.storeDir}/.../etc/dir/file.conf.example";
           target = "dir/file.conf";
           mode = "0440";
         }
diff --git a/modules/system/upstart-events/shutdown.nix b/modules/system/upstart-events/shutdown.nix
index cf06ba10d08b..10587af35b31 100644
--- a/modules/system/upstart-events/shutdown.nix
+++ b/modules/system/upstart-events/shutdown.nix
@@ -112,7 +112,7 @@ with pkgs.lib;
                   # (For instance, when applied to a bind-mount it
                   # unmounts the target of the bind-mount.)  !!! But
                   # we should use `-f' for NFS.
-                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != /nix/store ]; then
+                  if [ "$mp" != / -a "$mp" != /nix -a "$mp" != ${config.nixpkgs.config.nix.storeDir} ]; then
                       if umount -n "$mp"; then success=1; tryAgain=1; fi
                   fi
 
diff --git a/modules/virtualisation/amazon-image.nix b/modules/virtualisation/amazon-image.nix
index 66474158c686..481c0c58b7ee 100644
--- a/modules/virtualisation/amazon-image.nix
+++ b/modules/virtualisation/amazon-image.nix
@@ -34,9 +34,9 @@ with pkgs.lib;
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
-          mkdir -p /mnt/nix/store
+          mkdir -p /mnt${config.nixpkgs.config.nix.storeDir}
           echo "copying everything (will take a while)..."
-          cp -prd $storePaths /mnt/nix/store/
+          cp -prd $storePaths /mnt${config.nixpkgs.config.nix.storeDir}/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
@@ -44,7 +44,7 @@ with pkgs.lib;
 
           # Create the system profile to allow nixos-rebuild to work.
           chroot /mnt ${config.environment.nix}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+              -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
diff --git a/modules/virtualisation/nova-image.nix b/modules/virtualisation/nova-image.nix
index 1e891c35dc09..1b92f8d653d1 100644
--- a/modules/virtualisation/nova-image.nix
+++ b/modules/virtualisation/nova-image.nix
@@ -41,8 +41,8 @@ with pkgs.lib;
           # Copy all paths in the closure to the filesystem.
           storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
 
-          mkdir -p /mnt/nix/store
-          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt/nix/store/
+          mkdir -p /mnt${config.nixpkgs.config.nix.storeDir}
+          ${pkgs.rsync}/bin/rsync -av $storePaths /mnt${config.nixpkgs.config.nix.storeDir}/
 
           # Register the paths in the Nix database.
           printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
@@ -50,7 +50,7 @@ with pkgs.lib;
 
           # Create the system profile to allow nixos-rebuild to work.
           chroot /mnt ${config.environment.nix}/bin/nix-env \
-              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel}
+              -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles/system --set ${config.system.build.toplevel}
 
           # `nixos-rebuild' requires an /etc/NIXOS.
           mkdir -p /mnt/etc
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix
index 7738ce1f2e76..1340841369d9 100644
--- a/modules/virtualisation/qemu-vm.nix
+++ b/modules/virtualisation/qemu-vm.nix
@@ -222,7 +222,7 @@ let
 
           # Install GRUB and generate the GRUB boot menu.
           touch /etc/NIXOS
-          mkdir -p /nix/var/nix/profiles
+          mkdir -p ${config.nixpkgs.config.nix.stateDir}/nix/profiles
           ${config.system.build.toplevel}/bin/switch-to-configuration boot
 
           umount /boot
@@ -276,11 +276,11 @@ in
       chmod 1777 $targetRoot/tmp
 
       mkdir -p $targetRoot/boot
-      mount -o remount,ro $targetRoot/nix/store
+      mount -o remount,ro $targetRoot${config.nixpkgs.config.nix.storeDir}
       ${optionalString cfg.writableStore ''
         mkdir /mnt-store-tmpfs
         mount -t tmpfs -o "mode=755" none /mnt-store-tmpfs
-        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
+        mount -t aufs -o dirs=/mnt-store-tmpfs=rw:$targetRoot${config.nixpkgs.config.nix.storeDir}=rr none $targetRoot${config.nixpkgs.config.nix.storeDir}
       ''}
     '';
 
@@ -314,7 +314,7 @@ in
     [ { mountPoint = "/";
         device = "/dev/vda";
       }
-      { mountPoint = "/nix/store";
+      { mountPoint = "${config.nixpkgs.config.nix.storeDir}";
         device = "//10.0.2.4/store";
         fsType = "cifs";
         options = "guest,sec=none,noperm,noacl";