From 6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 13 May 2013 17:47:20 +0200
Subject: Fix some old Fedora builds

http://hydra.nixos.org/build/4949447
---
 pkgs/build-support/vm/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'pkgs/build-support')

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index e8351089ed29..202450da1661 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -492,8 +492,6 @@ rec {
 
         chroot=$(type -tP chroot)
 
-        ${utillinux}/bin/mount -t proc none /mnt/proc
-
         # Make the Nix store available in /mnt, because that's where the RPMs live.
         mkdir -p /mnt/nix/store
         ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store
@@ -506,6 +504,7 @@ rec {
           ln -s /usr/sbin /mnt/sbin
           ln -s /usr/lib /mnt/lib
           ln -s /usr/lib64 /mnt/lib64
+          ${utillinux}/bin/mount -t proc none /mnt/proc
         ''}
 
         echo "unpacking RPMs..."
@@ -533,7 +532,7 @@ rec {
 
         rm /mnt/.debug
 
-        ${utillinux}/bin/umount /mnt/nix/store /mnt/tmp /mnt/proc
+        ${utillinux}/bin/umount /mnt/nix/store /mnt/tmp ${lib.optionalString unifiedSystemDir /mnt/proc}
         ${utillinux}/bin/umount /mnt
       '';
 
-- 
cgit 1.4.1