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

  function, so obsolete it.

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

15 files changed, 18 insertions, 18 deletions

diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 8c2803c26d70..742f0bd0b4aa 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -32,7 +32,7 @@ rec {
   '' ["addInputs"];
 
   doInstall = a.fullDepEntry (''
-    ensureDir "$out"/share/fonts/ttf/
+    mkdir -p "$out"/share/fonts/ttf/
     cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf
   '') ["defEnsureDir" "minInit"];
       
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index c7f1ad38f47c..5f9cbec7a97a 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
   
   buildPhase = "true";
-  installPhase = "ensureDir $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
+  installPhase = "mkdir -p $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
 
   meta = {
     description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix
index 32050ac5c28f..2761ed6f3e69 100644
--- a/pkgs/data/fonts/clearlyU/default.nix
+++ b/pkgs/data/fonts/clearlyU/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/share/fonts
+      mkdir -p $out/share/fonts
       cp *.bdf $out/share/fonts
       cd $out/share/fonts
       mkfontdir 
diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix
index 75896e059bf4..b26d3bd8c1d6 100644
--- a/pkgs/data/fonts/corefonts/default.nix
+++ b/pkgs/data/fonts/corefonts/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
     cabextract --lowercase viewer1.cab
   
     fontDir=$out/share/fonts/truetype
-    ensureDir $fontDir
+    mkdir -p $fontDir
     cp *.ttf $fontDir
 
     # Also put the EULA there to be on the safe side.
diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index fb952f39604e..505746b3edfc 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -19,11 +19,11 @@ stdenv.mkDerivation {
     ln -s ${perl}/lib/*/*/unicore/* -t resources/
   '';
   installPhase = '' 
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     for i in $(find build -name '*.ttf'); do 
         cp $i $out/share/fonts/truetype; 
     done;
-    ensureDir $out/share/dejavu-fonts
+    mkdir -p $out/share/dejavu-fonts
     cp -r build/* $out/share/dejavu-fonts
   '';
 }
diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix
index 927cc48575d0..0d6750614d47 100644
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@@ -7,7 +7,7 @@ args : with args;
 	in with localDefs;
 let
 	doInstall = fullDepEntry ("
-		ensureDir \$out/share/fonts/
+		mkdir -p \$out/share/fonts/
 		cd \$out/share/fonts
 		for i in ${toString paths}; do
 			find \$i -type f -exec ln -s '{}' . ';' ;
diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix
index e1427a79f0d5..0ff2ec7ba166 100644
--- a/pkgs/data/fonts/freefont-ttf/default.nix
+++ b/pkgs/data/fonts/freefont-ttf/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   installPhase = ''
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
 
diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix
index eb7547e628f7..1690f82aa37d 100644
--- a/pkgs/data/fonts/junicode/default.nix
+++ b/pkgs/data/fonts/junicode/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/share/fonts/junicode-ttf
+      mkdir -p $out/share/fonts/junicode-ttf
       cp *.ttf $out/share/fonts/junicode-ttf
     '';
 
diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix
index a5dc014d8b4a..831a3ddbd09c 100644
--- a/pkgs/data/fonts/lmodern/default.nix
+++ b/pkgs/data/fonts/lmodern/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/texmf/
-    ensureDir $out/share/fonts/
+    mkdir -p $out/texmf/
+    mkdir -p $out/share/fonts/
 
     cp -r ./* $out/texmf/
     cp -r fonts/{opentype,type1} $out/share/fonts/
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix
index ceca85a0d231..7fe56987ad36 100644
--- a/pkgs/data/fonts/mph-2b-damase/default.nix
+++ b/pkgs/data/fonts/mph-2b-damase/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     unzip $src;
   '';
   installPhase = ''
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
   '';
 }
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index cb1225763fd0..c331b85029d9 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
   };
   
   installPhase = ''
-    ensureDir $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
     cp -v *.ttf $out/share/fonts/truetype
 
-    ensureDir "$out/doc/${name}"
+    mkdir -p "$out/doc/${name}"
     cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}"
   '';
 
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index 57f463ba64c7..64b18ffdaaab 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   buildPhase = "true";
   installPhase = "
     fontDir=$out/share/fonts/truetype
-    ensureDir $fontDir
+    mkdir -p $fontDir
     cp *.ttf $fontDir
   ";
 }
diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index 76d2f3b28c1a..79d1a0909058 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   
   installPhase =
     ''
-      ensureDir $out/share/fonts $out/share/fonts/truetype
+      mkdir -p $out/share/fonts $out/share/fonts/truetype
       cp ${pcf} $out/share/fonts/unifont.pcf.gz
       gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf
       cd $out/share/fonts
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index 73dcf368d72a..19996f3f1a31 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   buildPhase = "true";
   
   installPhase = "
-    ensureDir $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype
   ";
 
   meta = {
diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix
index ba38d8dc1abb..698ecc530462 100644
--- a/pkgs/data/fonts/wqy-zenhei/default.nix
+++ b/pkgs/data/fonts/wqy-zenhei/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   installPhase =
     ''
-      ensureDir $out/share/fonts
+      mkdir -p $out/share/fonts
       cp *.ttf $out/share/fonts
     '';