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

function, so obsolete it.

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

pkgs/applications/editors/jedit/default.nix

@@ -17,19 +17,19 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/share/jEdit
+    mkdir -p $out/share/jEdit
     cp build/jedit.jar $out/share/jEdit
-    ensureDir $out/share/jEdit/modes
+    mkdir -p $out/share/jEdit/modes
     cp -r modes/* $out/share/jEdit/modes
-    ensureDir $out/share/jEdit/icons
+    mkdir -p $out/share/jEdit/icons
     cp -r icons/* $out/share/jEdit/icons
-    ensureDir $out/share/jEdit/macros
+    mkdir -p $out/share/jEdit/macros
     cp -r macros/* $out/share/jEdit/macros
-    ensureDir $out/share/jEdit/doc
+    mkdir -p $out/share/jEdit/doc
     cp -r doc/* $out/share/jEdit/doc
     
     sed -i "s|Icon=.*|Icon=$out/share/jEdit/icons/jedit-icon48.png|g" package-files/linux/deb/jedit.desktop
-    ensureDir $out/share/applications
+    mkdir -p $out/share/applications
     mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
 
     patch package-files/linux/jedit << EOF
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     > 
     EOF
     sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp package-files/linux/jedit $out/bin/jedit
     chmod +x $out/bin/jedit
   '';

pkgs/applications/editors/jedit/wrapper.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     phases = "buildPhase";
 
     buildPhase = "
-ensureDir \$out/bin
+mkdir -p \$out/bin
 cat > \$out/bin/${jedit.name} << EOF
 #!/bin/sh
 exec $java -jar $jeditjar \\$*