summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-05-13 17:47:20 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-05-13 17:47:20 +0200
commit6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e (patch)
tree98b1bc009ee528e10d315da191d066e291b1ec9b /pkgs/build-support
parenta6781e121f33dd3f21f8c0bf1f151d3d3224fbe6 (diff)
downloadnixlib-6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e.tar
nixlib-6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e.tar.gz
nixlib-6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e.tar.bz2
nixlib-6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e.tar.lz
nixlib-6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e.tar.xz
nixlib-6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e.tar.zst
nixlib-6fb4c62f25a9f4da1679c9d98f5bfc7c73ff739e.zip
Fix some old Fedora builds
http://hydra.nixos.org/build/4949447
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/vm/default.nix5
1 files changed, 2 insertions, 3 deletions
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
       '';