* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644

pkgs/applications/virtualization/virtualbox/default.nix

@@ -57,7 +57,7 @@ stdenv.mkDerivation {
   installPhase = ''
     # Install VirtualBox files
     cd out/linux.*/release/bin
-    ensureDir $out/virtualbox
+    mkdir -p $out/virtualbox
     cp -av * $out/virtualbox
     
     # Install kernel module
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     make install
     
     # Create wrapper script
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp -v ${./VBox.sh} $out/bin/VBox.sh
     sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \
            -e "s|@QT4_PATH@|${qt4}/lib|" \
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
     done
     
     # Create and fix desktop item
-    ensureDir $out/share/applications
+    mkdir -p $out/share/applications
     sed -i -e "s|Icon=VBox|Icon=$out/virtualbox/VBox.png|" $out/virtualbox/virtualbox.desktop
     ln -sfv $out/virtualbox/virtualbox.desktop $out/share/applications
   '';

pkgs/applications/virtualization/virtualbox/guest-additions/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildInputs = [ patchelf cdrkit makeWrapper ];
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -r install/* $out
 
   '';
@@ -78,10 +78,10 @@ stdenv.mkDerivation {
     sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
     
     # Install binaries
-    ensureDir $out/sbin
+    mkdir -p $out/sbin
     install -m 755 sbin/VBoxService $out/sbin
 
-    ensureDir $out/bin
+    mkdir -p $out/bin
     install -m 755 bin/VBoxClient $out/bin
     install -m 755 bin/VBoxControl $out/bin
     install -m 755 bin/VBoxClient-all $out/bin
@@ -90,21 +90,21 @@ stdenv.mkDerivation {
             --prefix PATH : "${which}/bin"
 
     # Install OpenGL libraries
-    ensureDir $out/lib
+    mkdir -p $out/lib
     cp -v lib/VBoxOGL*.so $out/lib
-    ensureDir $out/lib/dri
+    mkdir -p $out/lib/dri
     ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so
     
     # Install desktop file
-    ensureDir $out/share/autostart
+    mkdir -p $out/share/autostart
     cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart
     
     # Install HAL FDI file
-    ensureDir $out/share/hal/fdi/policy
+    mkdir -p $out/share/hal/fdi/policy
     install -m 644 share/VBoxGuestAdditions/90-vboxguest.fdi $out/share/hal/fdi/policy
     
     # Install Xorg drivers
-    ensureDir $out/lib/xorg/modules/{drivers,input}
+    mkdir -p $out/lib/xorg/modules/{drivers,input}
     install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so
     install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so