public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some old Fedora builds

Browse Source 
http://hydra.nixos.org/build/4949447
This commit is contained in:
Eelco Dolstra 2013-05-13 17:47:20 +02:00
parent a6781e121f
commit 6fb4c62f25
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/vm/default.nix
View File

@ -492,8 +492,6 @@ rec {
chroot=$(type -tP chroot) 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. # Make the Nix store available in /mnt, because that's where the RPMs live.
mkdir -p /mnt/nix/store mkdir -p /mnt/nix/store
${utillinux}/bin/mount -o bind /nix/store /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/sbin /mnt/sbin
ln -s /usr/lib /mnt/lib ln -s /usr/lib /mnt/lib
ln -s /usr/lib64 /mnt/lib64 ln -s /usr/lib64 /mnt/lib64
${utillinux}/bin/mount -t proc none /mnt/proc
''} ''}
echo "unpacking RPMs..." echo "unpacking RPMs..."
@ -533,7 +532,7 @@ rec {
rm /mnt/.debug 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 ${utillinux}/bin/umount /mnt
''; '';