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

  function, so obsolete it.

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

9 files changed, 13 insertions, 13 deletions

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 3c900ca1eba2..b80d27bfcf9b 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -15,11 +15,11 @@ let
     prePhases = "extraLib";
     extraLib = ''
       installScripts(){
-        ensureDir ${targetScriptDir};
+        mkdir -p ${targetScriptDir};
         for p in "$@"; do cp "$p" ${targetScriptDir}; done
       }
       installPlugins(){
-        ensureDir ${targetPluginDir};
+        mkdir -p ${targetPluginDir};
         for p in "$@"; do cp "$p" ${targetPluginDir}; done
       }
     '';
@@ -137,7 +137,7 @@ rec {
       url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
       sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
     };
-    #postInstall = ''ensureDir $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
+    #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
     installPhase = "installPlugins src/gimp-lqr-plugin";
   };
 
@@ -190,7 +190,7 @@ rec {
     };
     installPhase = "
       installPlugins ufraw-gimp
-      ensureDir $out/bin
+      mkdir -p $out/bin
       cp ufraw $out/bin
     ";
   };
@@ -209,7 +209,7 @@ rec {
 
     installPhase = "
       installPlugins gimplensfun
-      ensureDir $out/bin
+      mkdir -p $out/bin
       cp gimplensfun $out/bin
     ";
 
diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index 795417dbf5b3..2557f0f82e58 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
 
   postInstall = ''
-    ensureDir "$out/nix-support"
+    mkdir -p "$out/nix-support"
     echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
   '';
 
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index 7c3826369ee9..dc397a614d3d 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage {
   '';
 
   postInstall = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     echo '#!/bin/sh' > $out/bin/jbrout
     echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout
     chmod +x $out/bin/jbrout
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 8ddaf9bc2792..9b39d8e8f1f7 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir $out/opt/meshlab $out/bin $out/lib
+    mkdir -p $out/opt/meshlab $out/bin $out/lib
     pushd distrib
     cp -R * $out/opt/meshlab
     popd
diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix
index 8f7ba7929147..e3c6deddb295 100644
--- a/pkgs/applications/graphics/minidjvu/default.nix
+++ b/pkgs/applications/graphics/minidjvu/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ libtiff gettext];
 
   preInstall = ''
-    ensureDir $out/lib
+    mkdir -p $out/lib
   '';
 
   meta = {
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index 12f01adc8300..349982bc24cb 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   # Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries?
   installPhase = ''
-    ensureDir $out/lib/pinta $out/bin
+    mkdir -p $out/lib/pinta $out/bin
     cp bin/*.{dll,exe} $out/lib/pinta
     cat > $out/bin/pinta << EOF
     #!/bin/sh
diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix
index eda187cbf235..4b61ac740cb9 100644
--- a/pkgs/applications/graphics/rawtherapee/default.nix
+++ b/pkgs/applications/graphics/rawtherapee/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
 
   installPhase = ''
-    ensureDir $out/bin $out/lib
+    mkdir -p $out/bin $out/lib
     cp rtgui/rt $out/bin
     # Weird kind of path reference
     cp -r ../release/* $out/bin
diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix
index b40a72512831..6d39c7f2a95f 100644
--- a/pkgs/applications/graphics/wings/default.nix
+++ b/pkgs/applications/graphics/wings/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ erlang esdl ];
 
   installPhase = ''
-    ensureDir $out/bin $out/lib/${name}/ebin
+    mkdir -p $out/bin $out/lib/${name}/ebin
     cp ebin/* $out/lib/${name}/ebin
     cp -R fonts textures shaders plugins $out/lib/$name
     cat << EOF > $out/bin/wings
diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix
index a746eb86b940..307c94779296 100644
--- a/pkgs/applications/graphics/xaos/default.nix
+++ b/pkgs/applications/graphics/xaos/default.nix
@@ -22,7 +22,7 @@ rec {
 
   preConfigure = a.fullDepEntry (''
     sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
-    ensureDir $out/share/locale
+    mkdir -p $out/share/locale
   '') ["doUnpack" "minInit" "defEnsureDir"];
       
   name = "xaos-" + version;