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

function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
author: Eelco Dolstra <eelco.dolstra@logicblox.com> 2012-01-18 20:16:00 +0000
committer: Eelco Dolstra <eelco.dolstra@logicblox.com> 2012-01-18 20:16:00 +0000
commit: c556a6ea46e71e1907d78b71fab36df30297b3ad (patch)
tree: 91a51d04a39ab4db1fb5182b56ce63cf9d9779b9 /pkgs/development
parent: f7159c195a623c311829c38c40ef010ac6e943f7 (diff)
164 files changed, 216 insertions, 216 deletions
diff --git a/pkgs/development/compilers/abc/builder-binjar.sh b/pkgs/development/compilers/abc/builder-binjar.sh
index 9faa0541c6c32..a954c49aa3f63 100644
--- a/pkgs/development/compilers/abc/builder-binjar.sh
+++ b/pkgs/development/compilers/abc/builder-binjar.sh
@@ -1,4 +1,4 @@
 source $stdenv/setup
 
-ensureDir $out/jars
+mkdir -p $out/jars
 cp $src $out/jars/$jarname.jar
diff --git a/pkgs/development/compilers/abc/builder.sh b/pkgs/development/compilers/abc/builder.sh
index 36d2e4e68e1ce..ba59402384267 100644
--- a/pkgs/development/compilers/abc/builder.sh
+++ b/pkgs/development/compilers/abc/builder.sh
@@ -23,7 +23,7 @@ EOF
 
 $apacheAnt/bin/ant jars
 
-ensureDir $out/jars
+mkdir -p $out/jars
 
 cp lib/abc.jar $out/jars
 cp lib/abc-runtime.jar $out/jars
@@ -31,7 +31,7 @@ cp lib/abc-testing.jar $out/jars
 cp lib/abc-complete.jar $out/jars
 
 # Create the executable abc script
-ensureDir $out/bin
+mkdir -p $out/bin
 cat > $out/bin/abc <<EOF
 #! $SHELL -e
 
diff --git a/pkgs/development/compilers/abc/jasmin/builder.sh b/pkgs/development/compilers/abc/jasmin/builder.sh
index c30f86fb7f5e1..81b150b952785 100644
--- a/pkgs/development/compilers/abc/jasmin/builder.sh
+++ b/pkgs/development/compilers/abc/jasmin/builder.sh
@@ -20,5 +20,5 @@ EOF
 
 ant jasmin-jar
 
-ensureDir $out/jars/
+mkdir -p $out/jars/
 mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar
diff --git a/pkgs/development/compilers/abc/polyglot/builder.sh b/pkgs/development/compilers/abc/polyglot/builder.sh
index 81acfde1d4f7e..babae49ae557f 100644
--- a/pkgs/development/compilers/abc/polyglot/builder.sh
+++ b/pkgs/development/compilers/abc/polyglot/builder.sh
@@ -6,6 +6,6 @@ cd polyglot-*
 ant polyglot-jar
 ant cup
 
-ensureDir $out/jars/
+mkdir -p $out/jars/
 mv lib/java_cup.jar $out/jars/
 mv lib/polyglot*.jar $out/jars/
diff --git a/pkgs/development/compilers/abc/soot/builder.sh b/pkgs/development/compilers/abc/soot/builder.sh
index 18718943077fe..adc27161e4e28 100644
--- a/pkgs/development/compilers/abc/soot/builder.sh
+++ b/pkgs/development/compilers/abc/soot/builder.sh
@@ -15,5 +15,5 @@ EOF
 
 ant classesjar
 
-ensureDir $out/jars/
+mkdir -p $out/jars/
 mv lib/sootclasses-foo.jar $out/jars/soot.jar
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index 190da87227846..fc4511d896e27 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     unzip ${src}
     t=$out/opt/flex-sdk
-    ensureDir $t $out/bin
+    mkdir -p $t $out/bin
     mv * $t
     rm $t/bin/*.exe $t/bin/*.bat
     sed 's/
$//' -i $t/bin/*
diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh
index 7b82f7f2a9ecb..3b43937200423 100755
--- a/pkgs/development/compilers/aspectj/builder.sh
+++ b/pkgs/development/compilers/aspectj/builder.sh
@@ -7,7 +7,7 @@ output.dir=$out
 context.javaPath=$jre
 EOF
 
-ensureDir $out
+mkdir -p $out
 $jre/bin/java -jar $src -text props
 
 echo "Removing files at top level"
diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index 404c0fce52325..54628fa509d90 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -21,10 +21,10 @@ rec {
   phaseNames = ["doUnpack" "doPatchElf" "doCopy"];
 
   doCopy = a.fullDepEntry ''
-    ensureDir "$out/share"
+    mkdir -p "$out/share"
     cp -r . "$out/share/ccl-installation"
 
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     for i in $(find . -maxdepth 1 -type f -perm +111); do
       echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")"
       chmod a+x "$out"/bin/"$(basename "$i")"
diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix
index 1e5c7d4febc82..11d0b723ce459 100644
--- a/pkgs/development/compilers/cmucl/binary.nix
+++ b/pkgs/development/compilers/cmucl/binary.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   name = "cmucl-binary-${version}";
 
   buildCommand = ''
-    ensureDir $out
+    mkdir -p $out
     tar -C $out -xjf ${dist}
     patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
       $out/bin/lisp
diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix
index 70d309472243d..4e288824713d7 100644
--- a/pkgs/development/compilers/eql/default.nix
+++ b/pkgs/development/compilers/eql/default.nix
@@ -64,7 +64,7 @@ rec {
 
   doDeploy = a.fullDepEntry (''
     cd ..
-    ensureDir $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib
+    mkdir -p $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib
     cp -r . $out/lib/eql/build-dir
     ln -s $out/lib/eql/build-dir/eql $out/bin
     ln -s $out/lib/eql/build-dir/src/*.h $out/include
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index d8830c4e24969..1cb4e479e37cf 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -23,7 +23,7 @@ rec {
   preBuild = fullDepEntry (''
     export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo'
     export LCL_PLATFORM=gtk2
-    ensureDir $out/share
+    mkdir -p $out/share
     tar xf ${fpc.src} --strip-components=1 -C $out/share -m
     sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc
   '') 
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index bda8372e6c46f..616c9de7edeb6 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -70,11 +70,11 @@ stdenv.mkDerivation rec {
   postInstall =
     (if stdenv.isDarwin then
       ''
-        ensureDir $out/frameworks/GMP.framework/Versions/A
+        mkdir -p $out/frameworks/GMP.framework/Versions/A
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
         # !!! fix this
-        ensureDir $out/frameworks/GNUeditline.framework/Versions/A
+        mkdir -p $out/frameworks/GNUeditline.framework/Versions/A
         ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline
         ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/Versions/A/GNUeditline
 
diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix
index 6394780eb68ca..a84b75d705b1b 100644
--- a/pkgs/development/compilers/ghc/6.12.1-binary.nix
+++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   postInstall =
     (if stdenv.isDarwin then
       ''
-        ensureDir $out/frameworks/GMP.framework/Versions/A
+        mkdir -p $out/frameworks/GMP.framework/Versions/A
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
         ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
         # !!! fix this
diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix
index 63cc08db34b12..2ed6f2be4fe46 100644
--- a/pkgs/development/compilers/ghc/6.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix
@@ -49,10 +49,10 @@ stdenv.mkDerivation {
   # that the executables work with no special setup.
   postInstall = if stdenv.isDarwin then ''
 
-    ensureDir $out/frameworks/GMP.framework/Versions/A
+    mkdir -p $out/frameworks/GMP.framework/Versions/A
     ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
     ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
-    ensureDir $out/frameworks/GNUreadline.framework/Versions/A
+    mkdir -p $out/frameworks/GNUreadline.framework/Versions/A
     ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline
     ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline
 
diff --git a/pkgs/development/compilers/ghc/6.6.1.nix b/pkgs/development/compilers/ghc/6.6.1.nix
index c54c32bfab0cc..994ebc286c30e 100644
--- a/pkgs/development/compilers/ghc/6.6.1.nix
+++ b/pkgs/development/compilers/ghc/6.6.1.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
   };
 
   postInstall = ''
-    ensureDir "$out/nix-support"
+    mkdir -p "$out/nix-support"
     echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook
     echo "ghc=$out" >> $out/nix-support/setup-hook
     echo ""         >> $out/nix-support/setup-hook
diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 19ce4eabf423e..63427ea82782a 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
     linkedTopDir="$out/lib"
     linkedPkgDir="$linkedTopDir/package.conf.d"
 
-    ensureDir $out/bin
-    ensureDir $linkedTopDir
-    ensureDir $linkedPkgDir
+    mkdir -p $out/bin
+    mkdir -p $linkedTopDir
+    mkdir -p $linkedPkgDir
 
     echo "Linking GHC core libraries:"
 
diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix
index 60342a14a61fc..b04cd18fb46cb 100644
--- a/pkgs/development/compilers/ghc/wrapper.nix
+++ b/pkgs/development/compilers/ghc/wrapper.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   unpackPhase = "true";
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp $GHCGetPackages $out/bin/ghc-get-packages.sh
     chmod 755 $out/bin/ghc-get-packages.sh
     for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     done
     EOF
     chmod +x $out/bin/ghc-packages
-    ensureDir $out/nix-support
+    mkdir -p $out/nix-support
     ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
   '';
 
diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix
index 954fb6bf594fd..79208743ae42a 100644
--- a/pkgs/development/compilers/gnatboot/default.nix
+++ b/pkgs/development/compilers/gnatboot/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   dontStrip=1;
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -R * $out
     set +e
     for a in $out/bin/* ; do
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index 3f2c327482215..143c091a1dc07 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation {
           else throw "Unsupported system";
 
   installPhase = ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     export GOROOT="$(pwd)/"
     export GOBIN="$out/bin"
     export PATH="$GOBIN:$PATH"
@@ -57,7 +57,7 @@ stdenv.mkDerivation {
 
     # Handle Libraries and make them availabale under /share/go.
     export GOLIB="pkg/"$GOOS"_"$GOARCH
-    ensureDir "$out/lib/go/$GOLIB"
+    mkdir -p "$out/lib/go/$GOLIB"
     cp -r ./$GOLIB $out/lib/go/pkg/
 
     # this line set $AS $CC $GC $LD
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
       --set "GOARCH" "$GOARCH"
 
     # Copy the emacs configuration for Go files.
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */
   '';
 
diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh
index d260bd559dc77..b14a0432ea58f 100644
--- a/pkgs/development/compilers/gwt/builder.sh
+++ b/pkgs/development/compilers/gwt/builder.sh
@@ -1,14 +1,14 @@
 source $stdenv/setup
 
 tar xfvj $src
-ensureDir $out
+mkdir -p $out
 cp -av $name $out
 
 # Create wrapper scripts so that the GWT compiler/host work
 
 libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12"
 
-ensureDir $out/bin
+mkdir -p $out/bin
 
 cat > $out/bin/gwt-compile <<EOF
 #!/bin/sh
diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix
index 33260cd5469ae..8018b478e809d 100644
--- a/pkgs/development/compilers/haxe/default.nix
+++ b/pkgs/development/compilers/haxe/default.nix
@@ -79,7 +79,7 @@ let
 
       # probably rpath should be set properly
       installPhase = ''
-        ensureDir $out/lib/haxe
+        mkdir -p $out/lib/haxe
         cp -r bin $out/bin
         wrapProgram "$out/bin/haxe" \
           --set "LD_LIBRARY_PATH" $zlib/lib \
@@ -107,7 +107,7 @@ let
         buildPhase = ''
           cd std/tools/${name};
           haxe *.hxml
-          ensureDir $out/bin
+          mkdir -p $out/bin
           mv ${name} $out/bin/
         '';
 
diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh
index 7f402dab1588c..ccfe2838d1b65 100644
--- a/pkgs/development/compilers/jdk/builder.sh
+++ b/pkgs/development/compilers/jdk/builder.sh
@@ -3,7 +3,7 @@ source $stdenv/setup
 
 unzip $src || true
 
-ensureDir $out
+mkdir -p $out
 mv $dirname/* $out/
 
 # Remove crap in the root directory.
diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
index ee58ce9127ca2..f0d36347ab0b4 100644
--- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
+++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh
@@ -10,7 +10,7 @@ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath
 echo "constructing JDK and JRE installations"
 if test -z "$installjdk"; then
   sh ${construct} . tmp-linux-jdk tmp-linux-jre
-  ensureDir $out
+  mkdir -p $out
   cp -R tmp-linux-jre/* $out
 else
   sh ${construct} . $out tmp-linux-jre
diff --git a/pkgs/development/compilers/jdk/ibm-builder.sh b/pkgs/development/compilers/jdk/ibm-builder.sh
index b78dac6163be1..2ff3a71322a62 100644
--- a/pkgs/development/compilers/jdk/ibm-builder.sh
+++ b/pkgs/development/compilers/jdk/ibm-builder.sh
@@ -17,7 +17,7 @@ fi
 
 tar zxf $pathname || true
 
-ensureDir $out
+mkdir -p $out
 mv $dirname/* $out/
 
 # Remove crap in the root directory.
diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix
index 70098a19a066e..fbaa80c115dfb 100644
--- a/pkgs/development/compilers/llvm/dragonegg.nix
+++ b/pkgs/development/compilers/llvm/dragonegg.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ llvm gmp mpfr mpc ];
 
   installPhase = ''
-    ensureDir $out/lib $out/share/doc/${name}
+    mkdir -p $out/lib $out/share/doc/${name}
     cp -d dragonegg.so $out/lib
     cp README COPYING $out/share/doc/${name}
   '';
diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix
index 060d59476cf2d..28a98fe1e258b 100644
--- a/pkgs/development/compilers/neko/default.nix
+++ b/pkgs/development/compilers/neko/default.nix
@@ -31,7 +31,7 @@ composableDerivation.composableDerivation {} ( fixed : {
       src/tools/install.neko
     sed -i "s@/usr/local@$out@" Makefile vm/load.c
     # make sure that nekotools boot finds the neko executable and not our wrapper:
-    ensureDir $out/{bin,lib}
+    mkdir -p $out/{bin,lib}
 
     sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko
     ln -s ./neko bin/.neko-wrapped
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 8bb201f975e73..c2700b01ffa43 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -28,19 +28,19 @@ stdenv.mkDerivation rec {
         patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b"
     done
     # FIXME: cgfxcat and cginfo need more patchelf
-    ensureDir "$out/bin/"
+    mkdir -p "$out/bin/"
     cp -v bin/* "$out/bin/"
-    ensureDir "$out/include/"
+    mkdir -p "$out/include/"
     cp -v -r include/Cg/ "$out/include/"
-    ensureDir "$out/lib/"
+    mkdir -p "$out/lib/"
     [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/"
     [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/"
     for mandir in man1 man3 manCg manCgFX
     do
-        ensureDir "$out/share/man/$mandir/"
+        mkdir -p "$out/share/man/$mandir/"
         cp -v share/man/$mandir/* "$out/share/man/$mandir/"
     done
-    ensureDir "$out/share/doc/$name/"
+    mkdir -p "$out/share/doc/$name/"
     cp -v -r local/Cg/* "$out/share/doc/$name/"
   '';
   
diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix
index fdd95db544062..281aa1a9de6f1 100644
--- a/pkgs/development/compilers/ocaml/3.10.0.nix
+++ b/pkgs/development/compilers/ocaml/3.10.0.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix
index 0add40dcd68fe..f7db9231bd42b 100644
--- a/pkgs/development/compilers/ocaml/3.11.1.nix
+++ b/pkgs/development/compilers/ocaml/3.11.1.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     patch -p0 < ${./mips64.patch}
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index eaf1f55e281bc..155523ebe5600 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
index 5b3052b544ab4..df3e9e73af59d 100644
--- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
+++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     cd ..
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
   postInstall = ''
diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
index b115a8fedcfb4..4313dcd7537e5 100644
--- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
+++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation (rec {
     sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang
   '';
   postBuild = ''
-    ensureDir $out/include
+    mkdir -p $out/include
     ln -sv $out/lib/ocaml/caml $out/include/caml
   '';
 
diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix
index 6df16e44c3d44..2a54b90dda982 100644
--- a/pkgs/development/compilers/opa/default.nix
+++ b/pkgs/development/compilers/opa/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     done
 
     # Install emacs mode.
-    ensureDir $out/share/emacs/site-lisp/opa
+    mkdir -p $out/share/emacs/site-lisp/opa
     install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa
   '';
 
diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix
index 88099a90949cc..cbd41033bfca6 100644
--- a/pkgs/development/compilers/openjdk-darwin/default.nix
+++ b/pkgs/development/compilers/openjdk-darwin/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -vR * $out/
   '';
 
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 0ea08071aaa0c..cf85c1706a8a6 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   ];
 
   postUnpack = ''
-    ensureDir drops
+    mkdir -p drops
     cp ${jaxp_src} drops/${jaxp_src_name}
     cp ${jaxws_src} drops/${jaxws_src_name}
     cp ${jaf_src} drops/${jaf_src_name}
@@ -114,14 +114,14 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out
   '';
 #  '' + (if jreOnly then "" else ''
 #    if [ -z $jre ]; then
 #      exit 0
 #    fi
-#    ensureDir $jre
+#    mkdir -p $jre
 #    cp -av build/*/j2re-image/* $jre
 #  '');
 
diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix
index 3c4723a88fb1a..6bec1925f0b89 100644
--- a/pkgs/development/compilers/pakcs/default.nix
+++ b/pkgs/development/compilers/pakcs/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     # The Prolog sources must be built in their final directory.
     (cd $out/curry2prolog/ ; make)
 
-    ensureDir $out/share/emacs/site-lisp/curry-pakcs
+    mkdir -p $out/share/emacs/site-lisp/curry-pakcs
     for e in "$out/tools/emacs/"*.el ; do
       ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/;
     done
diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix
index f1f34f87d6920..ae01725585493 100644
--- a/pkgs/development/compilers/qi/default.nix
+++ b/pkgs/development/compilers/qi/default.nix
@@ -16,8 +16,8 @@ let
 	allBuild = fullDepEntry ("
 		(sleep 0.1; echo ) | clisp install.txt;
 		(sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp 
-		ensureDir \$out/share
-		ensureDir \$out/bin
+		mkdir -p \$out/share
+		mkdir -p \$out/bin
 		cp -r . \$out/share/Qi-9.1
 		echo -e '#! ${shell}
 		arg1=\${1:-'\$out'/share/Qi-9.1/startup.txt}
diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 9ce9eaebc1237..f50c15a3a0b81 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     rm bin/*.bat
     mv * $out
   '';
diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix
index acae45626a09a..a45217a331adf 100644
--- a/pkgs/development/compilers/stalin/default.nix
+++ b/pkgs/development/compilers/stalin/default.nix
@@ -13,19 +13,19 @@ stdenv.mkDerivation rec {
   buildPhase = '' ./build '';
 
   installPhase = ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp stalin "$out/bin"
 
-    ensureDir "$out/man/man1"
+    mkdir -p "$out/man/man1"
     cp stalin.1 "$out/man/man1"
 
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp stalin.el "$out/share/emacs/site-lisp"
 
-    ensureDir "$out/doc/${name}"
+    mkdir -p "$out/doc/${name}"
     cp README "$out/doc/${name}"
 
-    ensureDir "$out/share/${name}/include"
+    mkdir -p "$out/share/${name}/include"
     cp "include/"* "$out/share/${name}/include"
 
     substituteInPlace "$out/bin/stalin" \
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index 7ece90e8601f6..058d84a12de8d 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -50,7 +50,7 @@ let version = "0.9.25"; in
     postInstall = ''
       makeinfo --force tcc-doc.texi || true
 
-      ensureDir "$out/share/info"
+      mkdir -p "$out/share/info"
       mv tcc-doc.info* "$out/share/info"
 
       echo 'int main () { printf ("it works!\n"); exit(0); }' | \
diff --git a/pkgs/development/compilers/visual-c++/builder.sh b/pkgs/development/compilers/visual-c++/builder.sh
index 137db50fb6298..5469f3760ca04 100644
--- a/pkgs/development/compilers/visual-c++/builder.sh
+++ b/pkgs/development/compilers/visual-c++/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 cabextract $src
 
@@ -12,7 +12,7 @@ rm ../vc* # reduce temporary disk usage a bit
 while read target; do
     read source
     echo "$source -> $target"
-    ensureDir $out/$(dirname $target)
+    mkdir -p $out/$(dirname $target)
     cp -p "$source" $out/"$target"
 done < $filemap
 
diff --git a/pkgs/development/compilers/visual-c++/test/builder.sh b/pkgs/development/compilers/visual-c++/test/builder.sh
index 8adb7e466ee03..c11ffc574a86e 100644
--- a/pkgs/development/compilers/visual-c++/test/builder.sh
+++ b/pkgs/development/compilers/visual-c++/test/builder.sh
@@ -2,5 +2,5 @@ source $stdenv/setup
 source $visualcpp/setup
 source $windowssdk/setup
 
-ensureDir $out/bin
+mkdir -p $out/bin
 cl "$(cygpath -w $src)" /Fe"$(cygpath -w $out/bin/hello.exe)" user32.lib
diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix
index 47d7c2654a181..341833fdf4724 100644
--- a/pkgs/development/compilers/vs90wrapper/default.nix
+++ b/pkgs/development/compilers/vs90wrapper/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "visual-studio-9.0";
   buildCommand = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe
   '';
 }
diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index 6cad083ac8539..6d074ac9f279e 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -28,7 +28,7 @@ rec {
     cd $out/share/${installSuffix}
     make LISP=${a.sbcl}/bin/sbcl
     make LISP=${a.sbcl}/bin/sbcl regression
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp saved_acl2 "$out/bin/acl2"
   '') ["doDeploy" "addInputs" "defEnsureDir"];
       
diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 65ff72bae56f8..24edb2ec4df50 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -32,7 +32,7 @@ rec {
   prepareBuild = a.fullDepEntry ''
     cd angelscript/projects/gnuc
     sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@"
-    ensureDir "$out/lib" "$out/bin" "$out/share" "$out/include"
+    mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include"
     export SHARED=1 
     export VERSION="${version}"
   '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
@@ -42,7 +42,7 @@ rec {
   '' ["minInit"];
 
   installDocs = a.fullDepEntry ''
-    ensureDir "$out/share/angelscript"
+    mkdir -p "$out/share/angelscript"
     cp -r ../../../docs  "$out/share/angelscript"
   '' ["defEnsureDir" "prepareBuild"];
       
diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix
index 7b53ea9022d68..8cf350e7e972a 100644
--- a/pkgs/development/interpreters/clojure/binary.nix
+++ b/pkgs/development/interpreters/clojure/binary.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   phases = "unpackPhase installPhase";
 
   installPhase = "
-    ensureDir $out/lib/java
+    mkdir -p $out/lib/java
     install -t $out/lib/java clojure.jar
   ";
 
diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix
index 23bf9ad03b783..2ad6f751f2bdd 100644
--- a/pkgs/development/interpreters/clojure/clooj.nix
+++ b/pkgs/development/interpreters/clojure/clooj.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   phases = "installPhase";
 
   installPhase = ''
-    ensureDir $out/lib/java
+    mkdir -p $out/lib/java
     ln -s ${jar} $out/lib/java/clooj.jar
   '';
 
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index f829beda7bab5..f68b89f039803 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   buildPhase = "ant";
 
   installPhase = "
-    ensureDir $out/lib/java
+    mkdir -p $out/lib/java
     install -t $out/lib/java clojure.jar
   ";
 
diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index cc994aeea34b5..593cc61dc4107 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     rm bin/*.bat
     mv * $out
   '';
diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix
index 3be0e8aa1174d..d4a1ab85b1397 100644
--- a/pkgs/development/interpreters/j/default.nix
+++ b/pkgs/development/interpreters/j/default.nix
@@ -53,11 +53,11 @@ rec {
   '' ["doUnpack" "addInputs" "minInit"];
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out"
+    mkdir -p "$out"
     cp -r j/bin "$out/bin"
     rm "$out/bin/profilex_template.ijs"
     
-    ensureDir "$out/share/j"
+    mkdir -p "$out/share/j"
 
     cp -r docs j/addons j/system "$out/share/j"
   '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"];
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index d26ab69493441..1e402e14e7da8 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a";
   };
 
-  installPhase = '' ensureDir $out; cp -r * $out '';
+  installPhase = '' mkdir -p $out; cp -r * $out '';
 
   meta = { 
     description = "Ruby interpreter written in Java";
diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix
index 2e433e11033f1..7e4f1e408b44a 100644
--- a/pkgs/development/interpreters/kona/default.nix
+++ b/pkgs/development/interpreters/kona/default.nix
@@ -29,7 +29,7 @@ rec {
   makeFlags = ["PREFIX=\$out"];
 
   prepareOut = a.fullDepEntry ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
   '' ["minInit" "defEnsureDir"];
       
   meta = {
diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix
index 06703e12210d9..c11a9d10d7b39 100644
--- a/pkgs/development/interpreters/lua-5/default.nix
+++ b/pkgs/development/interpreters/lua-5/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
   postInstall = ''
     sed -i -e "s@/usr/local@$out@" etc/lua.pc
     sed -i -e "s@-llua -lm@-llua -lm -ldl@" etc/lua.pc
-    ensureDir "$out/lib/pkgconfig"
+    mkdir -p "$out/lib/pkgconfig"
     install -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc
   '';
   buildInputs = [ ncurses readline ];
diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix
index f5d4fd0901594..de1a14b522b24 100644
--- a/pkgs/development/interpreters/maude/default.nix
+++ b/pkgs/development/interpreters/maude/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   postInstall =
   ''
     for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done
-    ensureDir $out/share/maude
+    mkdir -p $out/share/maude
     cp ${fullMaude} $out/share/maude/full-maude.maude
   '';
 
diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix
index 4b965999910c6..c421e2768cdc8 100644
--- a/pkgs/development/interpreters/perl/5.8/default.nix
+++ b/pkgs/development/interpreters/perl/5.8/default.nix
@@ -25,7 +25,7 @@ preBuild() {
 }
 
 postInstall() {
-    ensureDir "$out/nix-support"
+    mkdir -p "$out/nix-support"
     cp $setupHook $out/nix-support/setup-hook
 }
 
diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix
index 74aba643ee7d1..5a242f3c85a41 100644
--- a/pkgs/development/interpreters/php-xdebug/default.nix
+++ b/pkgs/development/interpreters/php-xdebug/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/lib/xdebug
+    mkdir -p $out/lib/xdebug
     cp modules/xdebug.so $out/lib
     cp LICENSE $out/lib/xdebug
   '';
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 298c12d271a40..196e7068e146d 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -41,7 +41,7 @@ rec {
 
     sed -e "s@/usr/@$out/@g" -i bin/pil
 
-    ensureDir "$out/share/picolisp" "$out/lib" "$out/bin"
+    mkdir -p "$out/share/picolisp" "$out/lib" "$out/bin"
     cp -r . "$out/share/picolisp/build-dir"
     ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp"
     ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp"
diff --git a/pkgs/development/interpreters/python/pythonhome-wrapper.nix b/pkgs/development/interpreters/python/pythonhome-wrapper.nix
index 2afbafe7b9141..c9cf6277b244f 100644
--- a/pkgs/development/interpreters/python/pythonhome-wrapper.nix
+++ b/pkgs/development/interpreters/python/pythonhome-wrapper.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   unpackPhase = "true";
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     echo '
 #!/bin/sh
 
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 6f29f79e2c168..727b9cbc67677 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   unpackPhase = "true";
   installPhase = ''
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do
       makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH"
     done
diff --git a/pkgs/development/interpreters/spidermonkey/builder.sh b/pkgs/development/interpreters/spidermonkey/builder.sh
index b0cfe6c9ed624..91110159665c0 100644
--- a/pkgs/development/interpreters/spidermonkey/builder.sh
+++ b/pkgs/development/interpreters/spidermonkey/builder.sh
@@ -22,9 +22,9 @@ $MAKE printlibraries
 $MAKE printprograms
 $MAKE
 
-ensureDir $out
-ensureDir $out/bin
-ensureDir $out/lib
+mkdir -p $out
+mkdir -p $out/bin
+mkdir -p $out/lib
 
 # Install the binaries that have been created.
 install $(cat PROGRAMS) $out/bin
diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh
index afd640b625d61..ff42e47ea56bf 100644
--- a/pkgs/development/libraries/Xaw3d/builder.sh
+++ b/pkgs/development/libraries/Xaw3d/builder.sh
@@ -15,7 +15,7 @@ installPhase() {
     make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include
     cd $out/include/X11 && ln -s Xaw3d Xaw
 
-    ensureDir "$out/nix-support"
+    mkdir -p "$out/nix-support"
     echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
 }
 
diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix
index 9aa08caf00f4c..c15e27695ac90 100644
--- a/pkgs/development/libraries/box2d/2.0.1.nix
+++ b/pkgs/development/libraries/box2d/2.0.1.nix
@@ -48,14 +48,14 @@ rec {
   '';
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out"/lib
-    ensureDir "$out"/include/Box2D
+    mkdir -p "$out"/lib
+    mkdir -p "$out"/include/Box2D
     cp Library/* Source/Gen/float/lib*.{a,so} "$out"/lib
     cp -r Source "$out"/include/Box2D/Source
     find "$out"/include/Box2D/Source ! -name '*.h' -exec rm '{}' ';'
     sed -e s@../Source@Box2D/Source@ -i Include/Box2D.h
     cp Include/Box2D.h "$out"/include/Box2D
-    ensureDir "$out/share"
+    mkdir -p "$out/share"
     cp -r Examples "$out/share"
   '' ["minInit" "addInputs" "doMake" "defEnsureDir"];
 
diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix
index 5dbb31e9bceff..d5471b9be75f3 100644
--- a/pkgs/development/libraries/chipmunk/default.nix
+++ b/pkgs/development/libraries/chipmunk/default.nix
@@ -28,7 +28,7 @@ rec {
   '' ["minInit" "addInputs" "doUnpack"];
 
   demoInstall = fullDepEntry(''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp Demo/chipmunk_demos $out/bin
   '') ["doMakeInstall" "defEnsureDir"];
       
diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix
index a40044ee3a34c..d1c081f45d859 100644
--- a/pkgs/development/libraries/clapack/default.nix
+++ b/pkgs/development/libraries/clapack/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ cmake ];
 
   installPhase = ''
-    ensureDir $out/include $out/lib
+    mkdir -p $out/include $out/lib
     cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib
     cp ../INCLUDE/* $out/include
   '';
diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix
index f070f2dfaef29..121f41a0f3c5f 100644
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/pkgs/development/libraries/cminpack/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   preInstall = ''
-    ensureDir $out/lib $out/include
+    mkdir -p $out/lib $out/include
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix
index 7ac4568a4e133..e1c59846aec53 100644
--- a/pkgs/development/libraries/dotnetfx35/default.nix
+++ b/pkgs/development/libraries/dotnetfx35/default.nix
@@ -8,7 +8,7 @@ in
     name = "dotnetfx-3.5";
     src = "${windir}/Microsoft.NET/Framework/v3.5";
     buildCommand = ''
-      ensureDir $out/bin
+      mkdir -p $out/bin
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix
index b9ce4738d129c..701464071d032 100644
--- a/pkgs/development/libraries/dotnetfx40/default.nix
+++ b/pkgs/development/libraries/dotnetfx40/default.nix
@@ -8,7 +8,7 @@ in
     name = "dotnetfx-4.0";
     src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
     buildCommand = ''
-      ensureDir $out/bin
+      mkdir -p $out/bin
       ln -s $src/MSBuild.exe $out/bin
     '';
   };
diff --git a/pkgs/development/libraries/eglibc/builder.sh b/pkgs/development/libraries/eglibc/builder.sh
index 47cd1b5e252f7..6ac1d223b47e1 100644
--- a/pkgs/development/libraries/eglibc/builder.sh
+++ b/pkgs/development/libraries/eglibc/builder.sh
@@ -20,7 +20,7 @@ preConfigure() {
     done
 
     # Include source for debugging
-    ensureDir $out/src
+    mkdir -p $out/src
     cp -R libc ports $out/src
     ln -s $out/src/ports $out/src/libc/ports
     # glibc wants -O2 minimum
diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/default.nix
index 1454d2ec94a9a..1f4df39408e81 100644
--- a/pkgs/development/libraries/glfw/default.nix
+++ b/pkgs/development/libraries/glfw/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ mesa libX11 libXext ];
 
   buildPhase = ''
-    ensureDir $out
+    mkdir -p $out
     make x11-install PREFIX=$out
   '';
   
diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc-2.13/default.nix
index 31a8ef13a4fe8..95778b50b70bd 100644
--- a/pkgs/development/libraries/glibc-2.13/default.nix
+++ b/pkgs/development/libraries/glibc-2.13/default.nix
@@ -28,7 +28,7 @@ in
     # any special hack.
     preInstall = ''
       if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then
-          ensureDir $out/lib
+          mkdir -p $out/lib
           ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
       fi
     '';
diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc-2.13/info.nix
index 84a16fefce9de..75bd996d9bc51 100644
--- a/pkgs/development/libraries/glibc-2.13/info.nix
+++ b/pkgs/development/libraries/glibc-2.13/info.nix
@@ -18,7 +18,7 @@ in
     # Somehow building the info still does not work, because the final
     # libc.info hasn't a Top node.
     installPhase = ''
-      ensureDir "$out/share/info"
+      mkdir -p "$out/share/info"
       cp -v "../$sourceRoot/manual/"*.info* "$out/share/info"
     '';
 
diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc-2.13/locales.nix
index d598e0e094dc9..b7eae50ca385c 100644
--- a/pkgs/development/libraries/glibc-2.13/locales.nix
+++ b/pkgs/development/libraries/glibc-2.13/locales.nix
@@ -39,7 +39,7 @@ in
 
     installPhase =
       ''
-        ensureDir "$out/lib/locale"
+        mkdir -p "$out/lib/locale"
         cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale"
       '';
 
diff --git a/pkgs/development/libraries/glibc-2.14/default.nix b/pkgs/development/libraries/glibc-2.14/default.nix
index 31a8ef13a4fe8..95778b50b70bd 100644
--- a/pkgs/development/libraries/glibc-2.14/default.nix
+++ b/pkgs/development/libraries/glibc-2.14/default.nix
@@ -28,7 +28,7 @@ in
     # any special hack.
     preInstall = ''
       if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then
-          ensureDir $out/lib
+          mkdir -p $out/lib
           ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
       fi
     '';
diff --git a/pkgs/development/libraries/glibc-2.14/info.nix b/pkgs/development/libraries/glibc-2.14/info.nix
index 84a16fefce9de..75bd996d9bc51 100644
--- a/pkgs/development/libraries/glibc-2.14/info.nix
+++ b/pkgs/development/libraries/glibc-2.14/info.nix
@@ -18,7 +18,7 @@ in
     # Somehow building the info still does not work, because the final
     # libc.info hasn't a Top node.
     installPhase = ''
-      ensureDir "$out/share/info"
+      mkdir -p "$out/share/info"
       cp -v "../$sourceRoot/manual/"*.info* "$out/share/info"
     '';
 
diff --git a/pkgs/development/libraries/glibc-2.14/locales.nix b/pkgs/development/libraries/glibc-2.14/locales.nix
index d598e0e094dc9..b7eae50ca385c 100644
--- a/pkgs/development/libraries/glibc-2.14/locales.nix
+++ b/pkgs/development/libraries/glibc-2.14/locales.nix
@@ -39,7 +39,7 @@ in
 
     installPhase =
       ''
-        ensureDir "$out/lib/locale"
+        mkdir -p "$out/lib/locale"
         cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale"
       '';
 
diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix
index 0cfad2990383f..b778743147e67 100644
--- a/pkgs/development/libraries/glibc-2.9/default.nix
+++ b/pkgs/development/libraries/glibc-2.9/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   buildNativeInputs = stdenv.lib.optionals (cross != null) [ gccCross ];
 
   preInstall = if (cross != null) then ''
-    ensureDir $out/lib
+    mkdir -p $out/lib
     ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
   '' else "";
 
diff --git a/pkgs/development/libraries/glibc-2.9/info.nix b/pkgs/development/libraries/glibc-2.9/info.nix
index 3201bb4744055..cc79bbece3d2e 100644
--- a/pkgs/development/libraries/glibc-2.9/info.nix
+++ b/pkgs/development/libraries/glibc-2.9/info.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   # Somehow building the info still does not work, because the final
   # libc.info hasn't a Top node.
   installPhase = ''
-    ensureDir $out/share/info
+    mkdir -p $out/share/info
     cp ../$sourceRoot/manual/*.info $out/share/info
   '';
 
diff --git a/pkgs/development/libraries/glibc-2.9/locales.nix b/pkgs/development/libraries/glibc-2.9/locales.nix
index 3046374ca3457..c7b1bb2bff0a1 100644
--- a/pkgs/development/libraries/glibc-2.9/locales.nix
+++ b/pkgs/development/libraries/glibc-2.9/locales.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
-      ensureDir $out/lib/locale
+      mkdir -p $out/lib/locale
       cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/
     '';
 
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index c01987bcc59d3..04fbb01a3bfcb 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -29,7 +29,7 @@ rec {
   phaseNames = ["createDirs" "setVars" "doMakeInstall"];
 
   createDirs = a.fullDepEntry ''
-    ensureDir "$out/"{bin,lib,share/man,share/info,include/gsm}
+    mkdir -p "$out/"{bin,lib,share/man,share/info,include/gsm}
   '' ["minInit" "defEnsureDir"];
 
   setVars = a.noDepEntry ''
diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix
index 3f5bac4d7e4e7..567e5e2300a79 100644
--- a/pkgs/development/libraries/haskell/cabal/cabal.nix
+++ b/pkgs/development/libraries/haskell/cabal/cabal.nix
@@ -126,12 +126,12 @@
 
               ./Setup copy
 
-              ensureDir $out/bin # necessary to get it added to PATH
+              mkdir -p $out/bin # necessary to get it added to PATH
 
               local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version}
               local installedPkgConf=$confDir/${self.fname}.installedconf
               local pkgConf=$confDir/${self.fname}.conf
-              ensureDir $confDir
+              mkdir -p $confDir
               ./Setup register --gen-pkg-config=$pkgConf
               if test -f $pkgConf; then
                 echo '[]' > $installedPkgConf
diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix
index 76f4a5a7dae05..78206de9f1417 100644
--- a/pkgs/development/libraries/hawknl/default.nix
+++ b/pkgs/development/libraries/hawknl/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   preInstall = ''
     sed -i s,/usr/local,$out, src/makefile.linux
-    ensureDir $out/lib $out/include
+    mkdir -p $out/lib $out/include
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix
index 9b45dbb91ec8c..55c4dbff29605 100644
--- a/pkgs/development/libraries/iniparser/default.nix
+++ b/pkgs/development/libraries/iniparser/default.nix
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec{
   buildFlags = "libiniparser.so";
 
   installPhase = ''
-    ensureDir $out/lib
+    mkdir -p $out/lib
     cp libiniparser.so.0 $out/lib
     ln -s libiniparser.so.0 $out/lib/libiniparser.so
 
-    ensureDir $out/include
+    mkdir -p $out/include
     cp src/*.h $out/include
 
-    ensureDir $out/share/doc/${name}
+    mkdir -p $out/share/doc/${name}
     for i in AUTHORS INSTALL LICENSE README; do
       bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2;
     done;
diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix
index f713ef2f645a7..9cd61adf77565 100644
--- a/pkgs/development/libraries/java/geoipjava/default.nix
+++ b/pkgs/development/libraries/java/geoipjava/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     '';
   installPhase =
     ''
-      ensureDir $out/share/java
+      mkdir -p $out/share/java
       cp maxmindgeoip.jar $out/share/java
     '';
   meta = {
diff --git a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh
index 605daff0cc85c..d37e110011e8b 100644
--- a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh
+++ b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh
@@ -1,4 +1,4 @@
 source $stdenv/setup
 
-ensureDir $out/share/java
+mkdir -p $out/share/java
 cp $src $out/share/java/$name.jar
diff --git a/pkgs/development/libraries/java/gwt-widgets/builder.sh b/pkgs/development/libraries/java/gwt-widgets/builder.sh
index f8961eb4f0481..8c2502385f2b5 100644
--- a/pkgs/development/libraries/java/gwt-widgets/builder.sh
+++ b/pkgs/development/libraries/java/gwt-widgets/builder.sh
@@ -2,5 +2,5 @@ source $stdenv/setup
 
 tar xfvz $src
 cd gwt-widgets-*
-ensureDir $out/share/java
+mkdir -p $out/share/java
 cp gwt-widgets-*.jar $out/share/java
diff --git a/pkgs/development/libraries/java/hsqldb/builder.sh b/pkgs/development/libraries/java/hsqldb/builder.sh
index 2f146a5234875..d7de23ab95eba 100755
--- a/pkgs/development/libraries/java/hsqldb/builder.sh
+++ b/pkgs/development/libraries/java/hsqldb/builder.sh
@@ -2,5 +2,5 @@ source $stdenv/setup
 
 unzip $src
 cd hsqldb*
-ensureDir $out
+mkdir -p $out
 cp -R * $out/
diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
index bb8c67285c5ab..1439c6101ab94 100644
--- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix
+++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = '' 
-    ensureDir "$out/lib/java"
+    mkdir -p "$out/lib/java"
     cp -v *.jar "$out/lib/java"
   '';
 }
diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix
index e384e35b23fa9..03433048270fb 100644
--- a/pkgs/development/libraries/java/jetty-gwt/default.nix
+++ b/pkgs/development/libraries/java/jetty-gwt/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf";
   };
   buildCommand = ''
-    ensureDir $out/share/java
+    mkdir -p $out/share/java
     cp $src $out/share/java/$name.jar
   '';
 }
diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix
index 8f1f676c10708..349339aad440c 100644
--- a/pkgs/development/libraries/java/jetty-util/default.nix
+++ b/pkgs/development/libraries/java/jetty-util/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq";
   };
   buildCommand = ''
-    ensureDir $out/share/java
+    mkdir -p $out/share/java
     cp $src $out/share/java/$name.jar
   '';
 }
diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix
index 300266fff5c0a..800ae7ba71858 100644
--- a/pkgs/development/libraries/java/rhino/default.nix
+++ b/pkgs/development/libraries/java/rhino/default.nix
@@ -23,7 +23,7 @@ in
       '' find -name \*.jar -or -name \*.class -exec rm -v {} \;
 
          # The build process tries to download it by itself.
-         ensureDir "build/tmp-xbean"
+         mkdir -p "build/tmp-xbean"
          ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip"
       '';
 
@@ -34,7 +34,7 @@ in
 
     # FIXME: Install javadoc as well.
     installPhase =
-      '' ensureDir "$out/lib/java"
+      '' mkdir -p "$out/lib/java"
          cp -v *.jar "$out/lib/java"
       '';
 
diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix
index ab67fc6b89340..bf1ee340d46f8 100644
--- a/pkgs/development/libraries/java/saxon/default8.nix
+++ b/pkgs/development/libraries/java/saxon/default8.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
 
   buildCommand = "
     unzip $src -d $out
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cat > $out/bin/saxon8 <<EOF
 #! $shell
 export JAVA_HOME=${jre}
diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh
index 276e3f6e6a912..bf86d59497e46 100644
--- a/pkgs/development/libraries/java/smack/builder.sh
+++ b/pkgs/development/libraries/java/smack/builder.sh
@@ -2,5 +2,5 @@ source $stdenv/setup
 
 tar xfvz $src
 cd smack*
-ensureDir $out/share/java
+mkdir -p $out/share/java
 cp *.jar $out/share/java
diff --git a/pkgs/development/libraries/java/swt/builder.sh b/pkgs/development/libraries/java/swt/builder.sh
index 0a2f304801ecf..9f678d7158bb9 100644
--- a/pkgs/development/libraries/java/swt/builder.sh
+++ b/pkgs/development/libraries/java/swt/builder.sh
@@ -7,12 +7,12 @@ export JAVA_HOME=${jdk}
 echo $JAVA_HOME=${jdk}
 sh ./build.sh make_swt make_atk
 
-ensureDir $out/lib
+mkdir -p $out/lib
 cp *.so $out/lib
 
 mkdir out
 javac -d out/ $(find org/ -name "*.java")
 
-ensureDir $out/jars
+mkdir -p $out/jars
 cp version.txt out/
 cd out && jar -c * > $out/jars/swt.jar
diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix
index ededecdf0e510..0aee98d27bdab 100644
--- a/pkgs/development/libraries/java/xalanj/default.nix
+++ b/pkgs/development/libraries/java/xalanj/default.nix
@@ -24,7 +24,7 @@ in
 
     # FIXME: Install javadoc as well.
     installPhase =
-      '' ensureDir "$out/lib/java"
+      '' mkdir -p "$out/lib/java"
          cp -v build/x*.jar "$out/lib/java"
       '';
 
diff --git a/pkgs/development/libraries/java/xerces/default.nix b/pkgs/development/libraries/java/xerces/default.nix
index 545bb21508c83..a40c30ae6c720 100644
--- a/pkgs/development/libraries/java/xerces/default.nix
+++ b/pkgs/development/libraries/java/xerces/default.nix
@@ -26,7 +26,7 @@ in
 
     # FIXME: Install javadoc as well.
     installPhase =
-      '' ensureDir "$out/lib/java"
+      '' mkdir -p "$out/lib/java"
          cp -v build/xerces*.jar "$out/lib/java"
       '';
 
diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix
index a17cdf0b4d586..3028ba7367cb4 100644
--- a/pkgs/development/libraries/levmar/default.nix
+++ b/pkgs/development/libraries/levmar/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir $out/include $out/lib
+    mkdir -p $out/include $out/lib
     cp lm.h $out/include
     cp liblevmar.a $out/lib
   '';
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 7d6ddd61581fe..4ba938911a41e 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   configureScript = "./configure2"; # wtf?
 
   preConfigure = ''
-    ensureDir $out
+    mkdir -p $out
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 30fd6835dfbb2..ee5d2e5e50e01 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   configureScript = "./configure2"; # wtf?
 
   preConfigure = ''
-    ensureDir $out
+    mkdir -p $out
   '';
 
   postInstall = ''
diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix
index b14809d47bf85..edcf177add7fe 100644
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   makeFlags = "-f makefile.u";
 
   installPhase = ''
-    ensureDir $out/include $out/lib
+    mkdir -p $out/include $out/lib
     cp libf2c.a $out/lib
     cp f2c.h $out/include
   '';
diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix
index 508827b9b3d50..c8fa978534d9c 100644
--- a/pkgs/development/libraries/libmilter/default.nix
+++ b/pkgs/development/libraries/libmilter/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildPhase = '' 
-    ensureDir $out/lib
+    mkdir -p $out/lib
     cd libmilter
     cat > a.m4 <<EOF
       define(\`confEBINDIR', \`$out/libexec')
diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix
index a3a6a6423d875..ad524c21ff10e 100644
--- a/pkgs/development/libraries/libopensc-dnie/default.nix
+++ b/pkgs/development/libraries/libopensc-dnie/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
     sed -i s,/usr,$out, usr/lib/pkgconfig/*
    
-    ensureDir $out
+    mkdir -p $out
     cp -R usr/lib $out
     cp -R usr/share $out
   '';
diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index 7ec95f03eff7c..c6446ab27a542 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   
   configureFlags = "--with-pcap=linux";
 
-  preInstall = ''ensureDir $out/bin'';
+  preInstall = ''mkdir -p $out/bin'';
   
   patches = [ ./libpcap_amd64.patch ];
 
diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix
index 4e13e5768f869..29a8c459c34cd 100644
--- a/pkgs/development/libraries/libpseudo/default.nix
+++ b/pkgs/development/libraries/libpseudo/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    ensureDir $out/include
-    ensureDir $out/lib
+    mkdir -p $out/include
+    mkdir -p $out/lib
   '';
 
   buildInputs = [pkgconfig glib ncurses];
diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix
index b9dbaf23512d3..b292580e70524 100644
--- a/pkgs/development/libraries/libviper/default.nix
+++ b/pkgs/development/libraries/libviper/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    ensureDir $out/include
-    ensureDir $out/lib
+    mkdir -p $out/include
+    mkdir -p $out/lib
   '';
 
   buildInputs = [pkgconfig glib ncurses gpm];
diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix
index b449d9c3ed38f..20433ab145882 100644
--- a/pkgs/development/libraries/libvterm/default.nix
+++ b/pkgs/development/libraries/libvterm/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    ensureDir $out/include
-    ensureDir $out/lib
+    mkdir -p $out/include
+    mkdir -p $out/lib
   '';
 
   buildInputs = [pkgconfig glib ncurses];
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 46dc1435bcd0c..05ce8019c4ec1 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [libxml2];
   
   postInstall = ''
-    ensureDir $out/nix-support
+    mkdir -p $out/nix-support
     ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/
   '';
 
diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix
index dd0dab46b76d5..0b795e78ad501 100644
--- a/pkgs/development/libraries/ncbi/default.nix
+++ b/pkgs/development/libraries/ncbi/default.nix
@@ -33,7 +33,7 @@ rec {
   '') ["preBuild" "addInputs"];
 
   deploy = a.fullDepEntry (''
-    ensureDir $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot
+    mkdir -p $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot
     cd ncbi/build
     cp *.o *.so $out/lib
     cp -r . $out/share/${name}/build-snapshot
diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix
index ca792ed4c914c..e03b9409cfa71 100644
--- a/pkgs/development/libraries/opencascade/default.nix
+++ b/pkgs/development/libraries/opencascade/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     mv $out/inc $out/include
-    ensureDir $out/share/doc/${name}
+    mkdir -p $out/share/doc/${name}
     cp -R ../doc $out/share/doc/${name}
   '';
 
diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix
index 6179742b42f7c..0f9a3dc2b2dad 100644
--- a/pkgs/development/libraries/pdf2xml/default.nix
+++ b/pkgs/development/libraries/pdf2xml/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   '';
   
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp exe/* $out/bin
   '';
 }
diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 016bd23cf1ca4..b4c8a7f17890e 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -74,7 +74,7 @@ let
       s=$out/bin/pg_db_postgis_enable
 
       sql_comments=$out/share/postgis-${version}/comments.sql
-      ensureDir $(dirname $sql_comments)
+      mkdir -p $(dirname $sql_comments)
       cp $(find -iname ${fix.fixed.sql_comments}) $sql_comments
 
       for script in $scriptNames; do
diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix
index 913f4acdc7dd5..e231c20e7a3ec 100644
--- a/pkgs/development/libraries/qtscriptgenerator/default.nix
+++ b/pkgs/development/libraries/qtscriptgenerator/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   
   installPhase = ''
     cd ..
-    ensureDir $out/lib/qt4/plugins/script
+    mkdir -p $out/lib/qt4/plugins/script
     cp -av plugins/script/* $out/lib/qt4/plugins/script
   '';
 
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index a731360be562a..3537dd3b4af39 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir "$out/lib"
+    mkdir -p "$out/lib"
     install -m755 *.a* "$out/lib"
     install -m755 *.so* "$out/lib"
     ln -sf liblapack.so.3 "$out/lib/liblapack.so"
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index 01dc63353d668..f18107c48a5eb 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
         fi
     done
 
-    ensureDir $out/pcsc/drivers
+    mkdir -p $out/pcsc/drivers
     cp -R proprietary/* $out/pcsc/drivers
   '';
 
diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 952d4ba9f2550..4c615b81552fd 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip scheme texinfo ];
 
   configurePhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     sed -i "Makefile" \
         -e "s|^[[:blank:]]*prefix[[:blank:]]*=.*$|prefix = $out/|g"
   '';
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index 7776b4d025940..4e1187aa0f762 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   postInstall = "aoeu";
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     make install DESTDIR="$out" 
   '';
 
diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix
index 211eecde4e435..8874a672ead0b 100644
--- a/pkgs/development/libraries/speech-tools/default.nix
+++ b/pkgs/development/libraries/speech-tools/default.nix
@@ -35,7 +35,7 @@ rec {
   '' ["minInit" "doUnpack"];
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out"/{bin,lib}
+    mkdir -p "$out"/{bin,lib}
     for d in bin lib; do
       for i in ./$d/*; do
         test "$(basename "$i")" = "Makefile" ||
diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix
index b025e9a68a9b3..dafa82bad3479 100644
--- a/pkgs/development/libraries/sphinxbase/default.nix
+++ b/pkgs/development/libraries/sphinxbase/default.nix
@@ -25,10 +25,10 @@ stdenv.mkDerivation (rec {
   outputs = [ "out" "lib" "headers" ];
 
   postInstall = ''
-    ensureDir $lib
+    mkdir -p $lib
     cp -av $out/lib* $lib
 
-    ensureDir $headers
+    mkdir -p $headers
     cp -av $out/include $headers
   '';
 }))
diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix
index 00558fc52e9d5..d1611cda623a7 100644
--- a/pkgs/development/libraries/suitesparse/default.nix
+++ b/pkgs/development/libraries/suitesparse/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     export PREFIX=$out
-    ensureDir $out/lib
-    ensureDir $out/include
+    mkdir -p $out/lib
+    mkdir -p $out/include
   '';
 
   NIX_CFLAGS = "-fPIC";
diff --git a/pkgs/development/libraries/tcp-wrappers/default.nix b/pkgs/development/libraries/tcp-wrappers/default.nix
index 1cb6472971c47..14335e6a3adb6 100644
--- a/pkgs/development/libraries/tcp-wrappers/default.nix
+++ b/pkgs/development/libraries/tcp-wrappers/default.nix
@@ -50,7 +50,7 @@ rec {
   '' ["minInit"];
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out"/{sbin,lib}
+    mkdir -p "$out"/{sbin,lib}
     make libwrap.so
     cp libwrap.{a,so} "$out/lib"
     find . -perm +111 -a ! -name '*.*' -exec cp '{}' "$out/sbin" ';'
diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 1fbfdc58fceb9..e669f8a254f1c 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   preConfigure =
     '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "Makefile.in"
     '';
-  preInstall = "ensureDir $out/etc";
+  preInstall = "mkdir -p $out/etc";
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 9e60f1ce8ba15..b67b015e018db 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
     '';
     
     installPhase = ''
-      ensureDir $out/bin
-      ensureDir $out/lib
+      mkdir -p $out/bin
+      mkdir -p $out/lib
       
       cp -v libv8.* $out/lib
       cp -v shell $out/bin/v8-shell
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 63c6574d32ad5..2daa1796318f1 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/pkgs/development/libraries/webkit/default.nix
@@ -69,7 +69,7 @@ rec {
   '') ["minInit" "doUnpack"];
 
   doAddPrograms = fullDepEntry (''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     for i in Programs/.libs/* Programs/*; do 
         cp $i $out/bin/webkit-program-$(basename $i) || true
     done
diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix
index 5eaaeec3d168a..d41d4683d6e98 100644
--- a/pkgs/development/libraries/webkit/svn.nix
+++ b/pkgs/development/libraries/webkit/svn.nix
@@ -70,7 +70,7 @@ rec {
   '') ["minInit" "doUnpack"];
 
   doAddPrograms = fullDepEntry (''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     for i in Programs/.libs/* Programs/*; do 
         cp $i $out/bin/webkit-program-$(basename $i) || true
     done
diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh
index 5ccfc1a7391fd..6db9469e46d2f 100644
--- a/pkgs/development/libraries/wtk/builder.sh
+++ b/pkgs/development/libraries/wtk/builder.sh
@@ -5,7 +5,7 @@ pushd unzipped
 unzip $src || true
 popd
 
-ensureDir $out
+mkdir -p $out
 mv unzipped/* $out/
 
 # Remove crap in the root directory.
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
index 3417596c3930d..b6bc94814e643 100644
--- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix
+++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
@@ -23,7 +23,7 @@ composableDerivation.composableDerivation {} rec {
             # export same env vars as in pythonNew
             preConfigure = ''
               export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages
-              ensureDir $out/nix-support
+              mkdir -p $out/nix-support
               echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook 
               echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook 
             '';
@@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec {
              preConfigure = ''
                export RUBY_LIB=$out/${ruby.libPath}
                export RUBY_LIB_ARCH=$RUBY_LIB
-               ensureDir $out/nix-support
+               mkdir -p $out/nix-support
                echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook 
                echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook 
              '';
diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index bb7643330a08d..93d31ada975cf 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -23,7 +23,7 @@ composableDerivation.composableDerivation {} rec {
             # export same env vars as in pythonNew
             preConfigure = ''
               export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages
-              ensureDir $out/nix-support
+              mkdir -p $out/nix-support
               echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook 
               echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook 
             '';
@@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec {
              preConfigure = ''
                export RUBY_LIB=$out/${ruby.libPath}
                export RUBY_LIB_ARCH=$RUBY_LIB
-               ensureDir $out/nix-support
+               mkdir -p $out/nix-support
                echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook 
                echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook 
              '';
diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix
index d8bc32350fb96..07220d6e1a65d 100644
--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/pkgs/development/libraries/xlibs-wrapper/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "xlibs-wrapper";
   buildPhase = "true";
-  installPhase = "ensureDir $out";
+  installPhase = "mkdir -p $out";
   unpackPhase = "sourceRoot=.";
   propagatedBuildInputs = packages;
 } // {
diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix
index 7c9fb19c27543..f79483874f6bd 100644
--- a/pkgs/development/misc/avr8-burn-omat/default.nix
+++ b/pkgs/development/misc/avr8-burn-omat/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   # move to nix-support to not create that many symlinks..
   # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog)
   installPhase = ''
-    ensureDir $out/{nix-support,bin}
+    mkdir -p $out/{nix-support,bin}
     mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support
     cat >> $out/bin/avr8-burn-omat << EOF
       #!/bin/sh
diff --git a/pkgs/development/misc/windows-sdk/builder.sh b/pkgs/development/misc/windows-sdk/builder.sh
index e834479882670..8f1eaffbcaf9b 100644
--- a/pkgs/development/misc/windows-sdk/builder.sh
+++ b/pkgs/development/misc/windows-sdk/builder.sh
@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 n=1
 for p in $srcs; do
@@ -21,7 +21,7 @@ done
 while read target; do
     read source
     echo "$source -> $target"
-    ensureDir "$out/$(dirname "$target")"
+    mkdir -p "$out/$(dirname "$target")"
     cp "$source" "$out/$target"
 done < $filemap
 
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index a7c96f1d2ea78..3ecf2ae46994a 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   configurePhase = "true"; 	# Skip configure
 
   preInstall = ''
-    ensureDir "$out/lib/ocaml/${ocaml_version}/site-lib"
+    mkdir -p "$out/lib/ocaml/${ocaml_version}/site-lib"
   '';
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 8aa3f2ba77e79..48e86ed9a68ff 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   buildFlags = "setup.data build";
 
-  preBuild = "ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit";
+  preBuild = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit";
 
   meta = {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix
index 13c25495cdc6d..976910aae29aa 100644
--- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   '';
 
   buildPhase = ''
-    ensureDir .test
+    mkdir -p .test
     make
     make opt
   '';
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index 9b477fed85173..1903068bb0b2f 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR
-    ensureDir $out/bin
+    mkdir -p $out/bin
   '';
 
   createFindlibDestdir = true;
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index adf66a4480655..858d459f5ca17 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -21,7 +21,7 @@ buildPerlPackage {
   # lib/perl5/site_perl, and the *.pm should be inside lib/perl5/site_perl/...
   # for other packages to get that in the PERL5LIB env var.
   postInstall = ''
-    ensureDir $out/lib/perl5/site_perl/
+    mkdir -p $out/lib/perl5/site_perl/
     cp -R $out/lib/perl5/5* $out/lib/perl5/site_perl
   '';
 }
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 46149177320d9..4e0b610023167 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -50,7 +50,7 @@ python.stdenv.mkDerivation (attrs // {
   # XXX: Should we run `easy_install --always-unzip'?  It doesn't seem
   # to have a noticeable impact on small scripts.
   installPhase = ''
-    ensureDir "$out/lib/${python.libPrefix}/site-packages"
+    mkdir -p "$out/lib/${python.libPrefix}/site-packages"
 
     echo "installing \`${name}' with \`easy_install'..."
     export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH"
diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix
index 3fc8058dfb2a3..df5d37853f72c 100644
--- a/pkgs/development/python-modules/xmpppy/default.nix
+++ b/pkgs/development/python-modules/xmpppy/default.nix
@@ -19,7 +19,7 @@ rec {
   /* doConfigure should be removed if not needed */
   phaseNames = ["mkDirs" "installPythonPackage"];
   mkDirs = a.fullDepEntry(''
-    ensureDir $out/bin $out/lib $out/share $(toPythonPath $out)
+    mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
     export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
   '') ["defEnsureDir" "addInputs"];
       
diff --git a/pkgs/development/ruby-modules/rake/default.nix b/pkgs/development/ruby-modules/rake/default.nix
index 00bad68b695e1..e1cec53aaa061 100644
--- a/pkgs/development/ruby-modules/rake/default.nix
+++ b/pkgs/development/ruby-modules/rake/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation {
   '';
   buildPhase = "true";
   installPhase = ''
-    ensureDir $out/lib
-    ensureDir $out/bin
+    mkdir -p $out/lib
+    mkdir -p $out/bin
     export DESTDIR=$out
     ruby install.rb
   '';
diff --git a/pkgs/development/ruby-modules/sqlite3/default.nix b/pkgs/development/ruby-modules/sqlite3/default.nix
index a37e91c488ff7..33a8951921e7a 100644
--- a/pkgs/development/ruby-modules/sqlite3/default.nix
+++ b/pkgs/development/ruby-modules/sqlite3/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   buildInputs = [ruby sqlite];
   buildPhase = "true";
   installPhase = ''
-    ensureDir $out/lib
+    mkdir -p $out/lib
     ruby setup.rb config --prefix=$out 
     # --bindir $out/bin --libdir $out/lib
     ruby setup.rb setup
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 17fc8de8c95ca..09656dc520a85 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/checkstyle
+    mkdir -p $out/checkstyle
     cp -R * $out/checkstyle
   '';
 
diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix
index 97e061d6b3f59..8275beff88d0c 100644
--- a/pkgs/development/tools/analysis/emma/default.nix
+++ b/pkgs/development/tools/analysis/emma/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [unzip];
 
   installPhase = ''
-    ensureDir $out/lib/jars
+    mkdir -p $out/lib/jars
     cp lib/*.jar $out/lib/jars/
   '';
 
diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix
index cf4f87f528e12..0623632936d75 100644
--- a/pkgs/development/tools/analysis/findbugs/default.nix
+++ b/pkgs/development/tools/analysis/findbugs/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -prd bin lib plugin doc $out/
     rm $out/bin/*.bat
   '';
diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix
index 6973fbad9e7c3..7498d3b652ac8 100644
--- a/pkgs/development/tools/analysis/jdepend/default.nix
+++ b/pkgs/development/tools/analysis/jdepend/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -R * $out
   '';
 
diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 7f50431c8d9a7..b830ee008389f 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -R * $out
   '';
 
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index cedd9584414fb..b4fdd4c09d4de 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile
   '';
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp ../Xspin*/xsp* $out/bin/xspin
     sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \
       -e '/exec wish/d' $out/bin/xspin
diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
index a5a19a6714368..ef6763a0fa28a 100644
--- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix
@@ -39,7 +39,7 @@ EOF
 
   # Note: We don't build the javadoc.
   buildPhase = ''
-    ensureDir "$out"
+    mkdir -p "$out"
     ./build.sh -Dant.install="$out" install-lite
   '';
 
@@ -48,7 +48,7 @@ EOF
     # rearrange a few things.
     rm -v "$out/bin/"*.bat
 
-    ensureDir "$out/lib/java"
+    mkdir -p "$out/lib/java"
     mv -v "$out/lib/"*.jar "$out/lib/java"
     sed -i "$out/bin/ant" \
         -e "s|^ANT_LIB=.*$|ANT_LIB=$out/lib/java|g ;
diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix
index ef5aed1f26edb..e7e4b6d090922 100644
--- a/pkgs/development/tools/build-managers/bam/default.nix
+++ b/pkgs/development/tools/build-managers/bam/default.nix
@@ -38,9 +38,9 @@ rec {
   '' ["build" "addInputs"];
 
   doDeploy = a.fullDepEntry ''
-    ensureDir "$out/share/bam"
+    mkdir -p "$out/share/bam"
     cp -r docs examples tests  "$out/share/bam"
-    ensureDir "$out/bin"
+    mkdir -p "$out/bin"
     cp bam "$out/bin"
   '' ["minInit" "defEnsureDir" "build"];
       
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 92b63869f33be..71862ec1cf75e 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage (rec {
   doCheck = false;
 
   postInstall =
-    '' ensureDir "$out/share/info"
+    '' mkdir -p "$out/share/info"
        make -C docs buildbot.info
        cp -v "docs/buildbot.info"* "$out/share/info"
     '';
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 9fc25aad64d21..576d8e357f4b8 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     rm bin/*.bat
     mv * $out
   '';
diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix
index d2a002a70cf79..6324fa92cbd92 100644
--- a/pkgs/development/tools/build-managers/jam/default.nix
+++ b/pkgs/development/tools/build-managers/jam/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp bin.linux/jam $out/bin
   '';
 
diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix
index 50dc907a78043..bf927db2793c4 100644
--- a/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/pkgs/development/tools/misc/cbrowser/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ tk makeWrapper ];
 
   installPhase = ''
-    ensureDir $out/bin $out/share/${name}
+    mkdir -p $out/bin $out/share/${name}
     cp -R * $out/share/${name}/
 
     makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \
diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index c27c7ab291a29..3cba5cd2e76a2 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     # Install Emacs mode.
     cd "contrib/xcscope"
 
-    ensureDir "$out/libexec/cscope"
+    mkdir -p "$out/libexec/cscope"
     cp "cscope-indexer" "$out/libexec/cscope"
 
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     emacs --batch --eval '(byte-compile-file "xcscope.el")'
     cp xcscope.el{,c} "$out/share/emacs/site-lisp"
   '';
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index fef5a71201ab7..6e6464a590beb 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   postInstall = ''
-    ensureDir "$out/share/emacs/site-lisp"
+    mkdir -p "$out/share/emacs/site-lisp"
     cp -v *.el "$out/share/emacs/site-lisp"
   '';
 
diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index f679577a3f1a0..69503782d6efc 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   configurePhase = "./Configure -n linux;";
   
   installPhase = ''
-    ensureDir $out/bin $out/man/man8
+    mkdir -p $out/bin $out/man/man8
     cp lsof.8 $out/man/man8/
     cp lsof $out/bin
   '';
diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix
index dddb577edbf31..1cb491df8d1ec 100644
--- a/pkgs/development/tools/misc/ninka/default.nix
+++ b/pkgs/development/tools/misc/ninka/default.nix
@@ -25,12 +25,12 @@ stdenv.mkDerivation {
   
   installPhase = ''
     cd ../..
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp ninka.pl $out/bin
     cp -av {extComments,splitter,filter,senttok,matcher} $out/bin
     
     cd comments/comments    
-    ensureDir $out/{bin,share/man/man1}
+    mkdir -p $out/{bin,share/man/man1}
     make install    
   '';
   
diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix
index 906770e90665d..e7adb30d3166c 100644
--- a/pkgs/development/tools/misc/sloccount/default.nix
+++ b/pkgs/development/tools/misc/sloccount/default.nix
@@ -37,9 +37,9 @@ stdenv.mkDerivation rec {
   checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test'';
 
   preInstall = ''
-    ensureDir "$out/bin"
-    ensureDir "$out/share/man/man1"
-    ensureDir "$out/share/doc"
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/man/man1"
+    mkdir -p "$out/share/doc"
   '';
 
   meta = {
diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix
index 30afee4586b05..f4b38f4f7abcd 100644
--- a/pkgs/development/tools/misc/unifdef/default.nix
+++ b/pkgs/development/tools/misc/unifdef/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp unifdef $out/bin
   '';
 
diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix
index a883024690aee..48a823c3c6569 100644
--- a/pkgs/development/tools/misc/usb-modeswitch/default.nix
+++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   preConfigure = ''
     find -type f | xargs sed 's@/bin/rm@rm@g' -i
     make clean
-    ensureDir $out/{etc,lib/udev,share/man/man1}
+    mkdir -p $out/{etc,lib/udev,share/man/man1}
     makeFlags="DESTDIR=$out PREFIX=$out"
   '';
 
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 8f77c0c6fc0d1..d049377ea9494 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     mv config/Makefile.unix config/Makefile
     substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
     substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl
-    ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
+    mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
   '';
 
   meta = {
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 70fb45a197958..c89af03097d7b 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
         fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/"
         if test -n "$createFindlibDestdir"; then
-          ensureDir $OCAMLFIND_DESTDIR
+          mkdir -p $OCAMLFIND_DESTDIR
         fi
     }
     
diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh
index 1d9f352c56989..b8e7791b6fc9b 100644
--- a/pkgs/development/tools/parsing/antlr/builder.sh
+++ b/pkgs/development/tools/parsing/antlr/builder.sh
@@ -4,8 +4,8 @@ tar zxvf $src
 cd antlr-*
 cd lib
 
-ensureDir $out/lib/antlr
-ensureDir $out/bin
+mkdir -p $out/lib/antlr
+mkdir -p $out/bin
 
 cp *.jar $out/lib/antlr
 
diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh
index 82689b42d72d0..075d2bc758c5b 100644
--- a/pkgs/development/tools/parsing/frown/builder.sh
+++ b/pkgs/development/tools/parsing/frown/builder.sh
@@ -2,6 +2,6 @@ source $stdenv/setup
 
 makeFlags="-e PREFIX=\"$out\""
 
-ensureDir $out/bin
+mkdir -p $out/bin
 
 genericBuild
diff --git a/pkgs/development/tools/parsing/jikespg/builder.sh b/pkgs/development/tools/parsing/jikespg/builder.sh
index 090def7c46434..e63ec9808f23a 100644
--- a/pkgs/development/tools/parsing/jikespg/builder.sh
+++ b/pkgs/development/tools/parsing/jikespg/builder.sh
@@ -8,7 +8,7 @@ configurePhase() {
 }
 
 installPhase() {
-  ensureDir $out/bin
+  mkdir -p $out/bin
   cp jikespg $out/bin
 }
 
diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix
index 0a7a12a6e1711..fbe11ed2bc040 100644
--- a/pkgs/development/tools/selenium/remote-control/default.nix
+++ b/pkgs/development/tools/selenium/remote-control/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
     buildInputs = [unzip];
     phases = "unpackPhase buildPhase";
     buildPhase = ''
-      ensureDir $out/{bin,lib}
+      mkdir -p $out/{bin,lib}
       mv * $out/lib
       bin="$out/bin/selenium-remote-control"
       cat >> "$bin" << EOF
@@ -37,7 +37,7 @@ in stdenv.mkDerivation {
     };
     phases = "buildPhase";
     buildPhase = ''
-      ensureDir $out/{bin,lib}
+      mkdir -p $out/{bin,lib}
       cp $src $out/lib/
       bin="$out/bin/selenium-remote-control"
       cat >> "$bin" << EOF
diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix
index 6f09603b2d56b..668ff6a7f4ae9 100644
--- a/pkgs/development/web/csslint/default.nix
+++ b/pkgs/development/web/csslint/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     sed -i "s/path\.join/path\.resolve/g" cli.js # fixes csslint issue #167
-    ensureDir $out/bin;
+    mkdir -p $out/bin;
     cp -r * $out/bin
     mv $out/bin/cli.js $out/bin/csslint
   '';
author	Eelco Dolstra <eelco.dolstra@logicblox.com>	2012-01-18 20:16:00 +0000
committer	Eelco Dolstra <eelco.dolstra@logicblox.com>	2012-01-18 20:16:00 +0000
commit	c556a6ea46e71e1907d78b71fab36df30297b3ad (patch)
tree	91a51d04a39ab4db1fb5182b56ce63cf9d9779b9 /pkgs/development
parent	f7159c195a623c311829c38c40ef010ac6e943f7 (diff)