From a5669270035b5fe2e8c50cce06be4ea8e11ac19f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 31 May 2016 15:16:21 +0200
Subject: [PATCH] Fix OOM in the installer test

http://hydra.nixos.org/build/36462209
(cherry picked from commit 1b5b654fe25cf7f2219ebe96a943397d683bfa0e)
---
 release.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/release.nix b/release.nix
index 922a629322a..cd8e9453a59 100644
--- a/release.nix
+++ b/release.nix
@@ -221,13 +221,15 @@ let
         ''
           useradd -m alice
           su - alice -c 'tar xf ${binaryTarball.x86_64-linux}/*.tar.*'
-          mount -t tmpfs none /nix # Provide a writable /nix.
+          mkdir /dest-nix
+          mount -o bind /dest-nix /nix # Provide a writable /nix.
           chown alice /nix
           su - alice -c '_NIX_INSTALLER_TEST=1 ./nix-*/install'
           su - alice -c 'nix-store --verify'
-          su - alice -c 'nix-store -qR ${build.x86_64-linux}'
+          su - alice -c 'PAGER= nix-store -qR ${build.x86_64-linux}'
           mkdir -p $out/nix-support
           touch $out/nix-support/hydra-build-products
+          umount /nix
         ''); # */
 
     tests.evalNixpkgs =