summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2009-10-02 09:11:42 +0000
committerRob Vermaas <rob.vermaas@gmail.com>2009-10-02 09:11:42 +0000
commitc2fe94783d8fcd141e4cbf8038b877e206926640 (patch)
tree9b54f38ad1875eff7196bcf992e56d5685315835 /pkgs/build-support
parent4e93d167d83c33284aa7e7c324f4f425722994aa (diff)
downloadnixlib-c2fe94783d8fcd141e4cbf8038b877e206926640.tar
nixlib-c2fe94783d8fcd141e4cbf8038b877e206926640.tar.gz
nixlib-c2fe94783d8fcd141e4cbf8038b877e206926640.tar.bz2
nixlib-c2fe94783d8fcd141e4cbf8038b877e206926640.tar.lz
nixlib-c2fe94783d8fcd141e4cbf8038b877e206926640.tar.xz
nixlib-c2fe94783d8fcd141e4cbf8038b877e206926640.tar.zst
nixlib-c2fe94783d8fcd141e4cbf8038b877e206926640.zip
svn path=/nixpkgs/trunk/; revision=17588
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/vm/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index a7cb6f6ad26b..98ea6bc89e7d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -530,7 +530,7 @@ rec {
       buildCommand = ''
         ${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
         # (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.
         mkdir -p /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
         
         # Misc. files/directories assumed by various packages.
@@ -584,6 +584,7 @@ rec {
         rm /mnt/.debug
         
         ${klibcShrunk}/bin/umount /mnt/inst/nix/store
+        ${klibcShrunk}/bin/umount /mnt/proc
         ${klibcShrunk}/bin/umount /mnt/dev
         ${klibcShrunk}/bin/umount /mnt
       '';