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

svn path=/nixpkgs/trunk/; revision=17588

Browse Source
This commit is contained in:
Rob Vermaas 2009-10-02 09:11:42 +00:00
parent 4e93d167d8
commit c2fe94783d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,7 +530,7 @@ rec {
buildCommand = '' buildCommand = ''
${createRootFS} ${createRootFS}
PATH=$PATH:${dpkg}/bin:${dpkg}/sbin:${glibc}/sbin PATH=$PATH:${dpkg}/bin:${dpkg}/sbin:${glibc}/sbin:${lzma}/bin
# Unpack the .debs. We do this to prevent pre-install scripts # Unpack the .debs. We do this to prevent pre-install scripts
# (which have lots of circular dependencies) from barfing. # (which have lots of circular dependencies) from barfing.
@ -546,7 +546,7 @@ rec {
# Make the Nix store available in /mnt, because that's where the .debs live. # Make the Nix store available in /mnt, because that's where the .debs live.
mkdir -p /mnt/inst/nix/store mkdir -p /mnt/inst/nix/store
${klibcShrunk}/bin/mount -o bind /nix/store /mnt/inst/nix/store ${klibcShrunk}/bin/mount -o bind /nix/store /mnt/inst/nix/store
${klibcShrunk}/bin/mount -o bind /proc /mnt/proc
${klibcShrunk}/bin/mount -o bind /dev /mnt/dev ${klibcShrunk}/bin/mount -o bind /dev /mnt/dev
# Misc. files/directories assumed by various packages. # Misc. files/directories assumed by various packages.
@ -584,6 +584,7 @@ rec {
rm /mnt/.debug rm /mnt/.debug
${klibcShrunk}/bin/umount /mnt/inst/nix/store ${klibcShrunk}/bin/umount /mnt/inst/nix/store
${klibcShrunk}/bin/umount /mnt/proc
${klibcShrunk}/bin/umount /mnt/dev ${klibcShrunk}/bin/umount /mnt/dev
${klibcShrunk}/bin/umount /mnt ${klibcShrunk}/bin/umount /mnt
''; '';