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

  function, so obsolete it.

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

11 files changed, 13 insertions, 13 deletions

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index c9f0fb98af73..2a0caf930015 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   ];
 
   buildPhase = ''
-    ensureDir $out
+    mkdir -p $out
     export CXX=g++
     scons PREFIX=$out install
   '';
diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix
index bdda1c6d8d96..e75be3e2c2be 100644
--- a/pkgs/applications/audio/gmu/default.nix
+++ b/pkgs/applications/audio/gmu/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     cp ${keymap}.keymap $out/share/gmu/default.keymap
     cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf
-    ensureDir $out/etc/gmu
+    mkdir -p $out/etc/gmu
     cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
   '';
 
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index 7f062b1799fa..8e7f573cc849 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = ''
-    ensureDir $out/bin $out/man/man1
+    mkdir -p $out/bin $out/man/man1
   '';
 
   meta = {
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 1557913f4017..b563c850d528 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   postInstall =
     ''
-      ensureDir $out/share/ladspa/
+      mkdir -p $out/share/ladspa/
       ln -sv $out/lib/ladspa $out/share/ladspa/lib
     '';
 
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index 8cd3dcc1bfba..30ba34af16c5 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -13,7 +13,7 @@ in
   in with localDefs;
 let
   copyFile = fullDepEntry ("
-    ensureDir \$out/include
+    mkdir -p \$out/include
     cp ${src} \$out/include/ladspa.h
   ") [minInit defEnsureDir];
 in
diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix
index 86ffca4242fa..d5a8138a5001 100644
--- a/pkgs/applications/audio/mp3info/default.nix
+++ b/pkgs/applications/audio/mp3info/default.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
     '';
 
   preInstall =
-    '' ensureDir "$out/bin"
-       ensureDir "$out/man/man1"
+    '' mkdir -p "$out/bin"
+       mkdir -p "$out/man/man1"
     '';
 
   meta = {
diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix
index 4ea26b458a7c..ccaa428a3f41 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/pkgs/applications/audio/mpc123/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     # XXX: Should install locales too (though there's only 1 available).
-    '' ensureDir "$out/bin"
+    '' mkdir -p "$out/bin"
        cp -v mpc123 "$out/bin"
     '';
 
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index e7957e866f1a..c295767687f6 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -40,7 +40,7 @@ rec {
 
   makeDocsWork = fullDepEntry ''
                 # hackish way to make html docs work
-                h="$out/share/snd/html"; ensureDir "$h"; cp *.html "$h"
+                h="$out/share/snd/html"; mkdir -p "$h"; cp *.html "$h"
                 patch -p1 < ${./doc.patch}
                 sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
             '' ["defEnsureDir"];
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d3ac4c4168c8..3a2beff04133 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    ensureDir $out/{bin,share/sonic-visualiser}
+    mkdir -p $out/{bin,share/sonic-visualiser}
     cp sonic-visualiser/sonic-visualiser $out/bin
     cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
     wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index b751e4da33ed..279820a723fb 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation  rec {
   buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];
 
   configurePhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     sed -e "s@/usr/local@$out@" -i Makefile
   '';
 
diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix
index 528f0b3412c1..0cfbfb4c9bd1 100644
--- a/pkgs/applications/audio/xsynth-dssi/default.nix
+++ b/pkgs/applications/audio/xsynth-dssi/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation  rec {
     ladspaPlugins liblo pkgconfig ];
 
   installPhase = ''
-    ensureDir $out/bin
-    ensureDir $out/lib
+    mkdir -p $out/bin
+    mkdir -p $out/lib
     cp src/Xsynth_gtk $out/bin
     cp src/.libs/* $out/lib
   '';