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

function, so obsolete it.

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

pkgs/misc/drivers/gutenprint/bin.nix

@@ -11,7 +11,7 @@ add the following lines to bindirCmds property of  printing/cupsd.nix:
 
   ln -s ${pkgs.gutenprintBin}/lib/cups/backend/* $out/lib/cups/backend/
   ln -s ${pkgs.gutenprintBin}/lib/cups/filter/* $out/lib/cups/filter/
-  ensureDir $out/lib/cups/model
+  mkdir -p $out/lib/cups/model
   cat ${pkgs.gutenprintBin}/ppds/Canon/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd.gz |gunzip > $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd
   sed -i 's@/opt/gutenprint/cups@${pkgs.gutenprintBin}/cups@' $out/lib/cups/model/Canon-PIXMA_iP4000-gutenprint.5.0.sim-en.ppd
 

pkgs/misc/emulators/atari800/builder.sh

@@ -6,7 +6,7 @@ preConfigure() {
 
 postInstall() {
     romsDir=$out/share/atari800/roms
-    ensureDir $romsDir
+    mkdir -p $romsDir
     unzip $rom -d $romsDir
 }
 

pkgs/misc/emulators/darcnes/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXt libXext libXaw ];
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp darcnes $out/bin
   '';
 

pkgs/misc/emulators/dosbox/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   postInstall = ''
-     ensureDir $out/share/applications
+     mkdir -p $out/share/applications
      cp ${desktopItem}/share/applications/* $out/share/applications
   '';
 

pkgs/misc/emulators/fakenes/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     libXxf86vm libXcursor libXpm ];
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp fakenes $out/bin
   '';
 

pkgs/misc/emulators/mess/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation {
 
   installPhase =
     ''
-      ensureDir $out/bin
+      mkdir -p $out/bin
       cp mess* $out/bin/mess 
     '';
     

pkgs/misc/emulators/vice/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
   
   postInstall = ''
-    ensureDir $out/share/applications
+    mkdir -p $out/share/applications
     cp ${desktopItem}/share/applications/* $out/share/applications
   '';
   

pkgs/misc/foldingathome/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     for a in $BINFILES; do 
       patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $a
     done
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp $BINFILES $out/bin
   '';
 

pkgs/misc/gxemul/default.nix

@@ -8,8 +8,8 @@ composableDerivation.composableDerivation {} {
   inherit name;
   
   flags = {
-    doc   = { installPhase = "ensureDir \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
-    demos = { installPhase = "ensureDir \$out/share/${name}; cp -r demos \$out/share/${name};"; };
+    doc   = { installPhase = "mkdir -p \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
+    demos = { installPhase = "mkdir -p \$out/share/${name}; cp -r demos \$out/share/${name};"; };
     man   = { installPhase = "cp -r ./man \$out/;";};
   };
 
@@ -19,7 +19,7 @@ composableDerivation.composableDerivation {} {
     manSupport = true;
   };
 
-  installPhase = "ensureDir \$out/bin; cp gxemul \$out/bin;";
+  installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;";
 
   src = fetchurl {
     url = http://gavare.se/gxemul/src/gxemul-0.4.6.tar.gz;

pkgs/misc/jackaudio/jack1.nix

@@ -36,7 +36,7 @@ composableDerivation.composableDerivation {} {
   
   # make sure the jackaudio is found by symlinking lib64 to lib
   postInstall = ''
-    ensureDir $out/lib
+    mkdir -p $out/lib
     ln -s $out/lib{64,}/pkgconfig
   '';
   

pkgs/misc/misc.nix

@@ -95,7 +95,7 @@ in
         )
       }
 
-      ensureDir $target/{include,lib}
+      mkdir -p $target/{include,lib}
       link $target/lib "$(echo "''${!LIB_PATHS[@]}")"
       link $target/include "$(echo "''${!INCLUDE_PATHS[@]}")"
       echo "''${!LIBS[@]}" > $target/libs

pkgs/misc/sane-backends/default.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     if test "$udevSupport" = "1"; then
-      ensureDir $out/etc/udev/rules.d/
+      mkdir -p $out/etc/udev/rules.d/
       ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
       cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
     fi

pkgs/misc/sane-backends/snapshot.nix

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     if test "$udevSupport" = "1"; then
-      ensureDir $out/etc/udev/rules.d/
+      mkdir -p $out/etc/udev/rules.d/
       ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \
       cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules
     fi

pkgs/misc/screensavers/electricsheep/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   preInstall = ''
     installFlags=GNOME_DATADIR=$out
-    ensureDir $out/control-center/screensavers
+    mkdir -p $out/control-center/screensavers
   '';
 
   meta = {

pkgs/misc/screensavers/rss-glx/builder.sh

@@ -2,9 +2,9 @@ source $stdenv/setup
 
 # This is a very dirty hack to prevent the binaries from putting the
 # Mesa libraries in their RPATHs.
-ensureDir $out/tmp
+mkdir -p $out/tmp
 ln -s $mesa/lib/* $out/tmp/
-ensureDir $out/lib
+mkdir -p $out/lib
 ln -s $mesa/lib/libGLU* $out/lib/
 export NIX_LDFLAGS="-L$out/tmp $NIX_LDFLAGS"
 
@@ -14,7 +14,7 @@ rm -rf $out/tmp
 
 
 # Add a wrapper around each program to use the appropriate OpenGL driver.
-ensureDir $out/bin/.orig
+mkdir -p $out/bin/.orig
 
 for i in $(cd $out/bin && ls); do
     mv $out/bin/$i $out/bin/.orig/$i

pkgs/misc/source-and-tags/default.nix

@@ -28,13 +28,13 @@ args: with args; {
            '') createTagFiles );
       in ''
       SRC_DEST=$out/src/$name
-      ensureDir $SRC_DEST
+      mkdir -p $SRC_DEST
       pwd; ls
       cp -r $srcDir $SRC_DEST
       cd $SRC_DEST
       ${createTags}
 
-      ensureDir $out/nix-support
+      mkdir -p $out/nix-support
       echo "TAG_FILES=\"\$TAG_FILES\''${TAG_FILES:+:}$TAG_FILES\"" >> $out/nix-support/setup-hook
     '';
   };

pkgs/misc/tex/lazylist/builder.sh

@@ -4,7 +4,7 @@ buildPhase=true
 
 installPhase=myInstallPhase
 myInstallPhase() {
-  ensureDir "$out/share/texmf-nix/tex/latex/lazylist"
+  mkdir -p "$out/share/texmf-nix/tex/latex/lazylist"
   cp lazylist.sty "$out/share/texmf-nix/tex/latex/lazylist"
 }
 

pkgs/misc/tex/lkproof/default.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ unzip ];
 
   installPhase = "
-    ensureDir $out/share/texmf-nix/tex/generic/lkproof
+    mkdir -p $out/share/texmf-nix/tex/generic/lkproof
     cp -prd *.sty $out/share/texmf-nix/tex/generic/lkproof
   ";
 }

pkgs/misc/tex/nix/animatedot.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 for ((i = 1; i <= $nrFrames; i++)); do
     echo "producing frame $i...";

pkgs/misc/tex/nix/default.nix

@@ -182,7 +182,7 @@ rec {
           ln -s $postscript $input
         fi
 
-        ensureDir $out
+        mkdir -p $out
         convert -units PixelsPerInch \
           -density 600 \
           -trim \

pkgs/misc/tex/nix/dot2pdf.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 dot2pdf() {
     sourceFile=$1

pkgs/misc/tex/nix/dot2ps.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 dot2ps() {
     sourceFile=$1

pkgs/misc/tex/nix/lhs2tex.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 mkdir root
 cd root

pkgs/misc/tex/nix/run-latex.sh

@@ -1,6 +1,6 @@
 source $stdenv/setup
 
-ensureDir $out
+mkdir -p $out
 
 export TEXMFCNF=$TMPDIR:
 echo 'max_print_line = 8192' >> $TMPDIR/texmf.cnf

pkgs/misc/tex/pgf/1.x.nix

@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   buildPhase = "true";
   installPhase = "
-    ensureDir $out/share/texmf-nix
+    mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
 }

pkgs/misc/tex/pgf/2.x.nix

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   buildPhase = "true";
   
   installPhase = "
-    ensureDir $out/share/texmf-nix
+    mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
 }

pkgs/misc/tex/polytable/builder.sh

@@ -4,14 +4,14 @@ buildPhase=true
 
 installPhase=myInstallPhase
 myInstallPhase() {
-  ensureDir "$out/share/texmf-nix/tex/latex/polytable"
-  ensureDir "$out/share/texmf-nix/doc/latex/polytable"
+  mkdir -p "$out/share/texmf-nix/tex/latex/polytable"
+  mkdir -p "$out/share/texmf-nix/doc/latex/polytable"
   latex polytable.ins
   pdflatex polytable.dtx
   pdflatex polytable.dtx
   cp polytable.sty "$out/share/texmf-nix/tex/latex/polytable"
   cp polytable.pdf "$out/share/texmf-nix/doc/latex/polytable"
-  ensureDir "$out/nix-support"
+  mkdir -p "$out/nix-support"
   echo "$propagatedUserEnvPackages" > "$out/nix-support/propagated-user-env-packages"
 }
 

pkgs/misc/tex/tetex/default.nix

@@ -33,8 +33,8 @@ stdenv.mkDerivation {
 
   postUnpack =
     ''
-      ensureDir $out/share/texmf
-      ensureDir $out/share/texmf-dist
+      mkdir -p $out/share/texmf
+      mkdir -p $out/share/texmf-dist
       gunzip < $texmf | (cd $out/share/texmf-dist && tar xvf -)
     '';
 

pkgs/misc/tex/tex4ht/default.nix

@@ -21,12 +21,12 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    ensureDir $out/bin
+    mkdir -p $out/bin
     for f in src/tex4ht src/t4ht src/htcmd bin/unix/*; do # */
       mv $f $out/bin/.
     done
 
-    ensureDir $out/share
+    mkdir -p $out/share
     cp -r texmf $out/share/.
   '';
 

pkgs/misc/tex/texlive/aggregate.nix

@@ -7,12 +7,12 @@ rec {
 
   doAggregate = fullDepEntry (''
 
-    ensureDir $out/bin
+    mkdir -p $out/bin
     for currentPath in ${lib.concatStringsSep " " buildInputs}; do
         echo Symlinking "$currentPath"
         find $currentPath/share/info $currentPath/share/man $(echo $currentPath/texmf*/) ! -type d | while read; do
             REPLY="''${REPLY#$currentPath}"
-            ensureDir $out/"$(dirname "$REPLY")"
+            mkdir -p $out/"$(dirname "$REPLY")"
             ln -fs $currentPath/"$REPLY" $out/"$REPLY"
             echo
         done | while read; do head -n 99 >/dev/null; echo -n .; done
@@ -33,7 +33,7 @@ rec {
     rm -r $out/texmf-config
     find $out/texmf/ -type d | while read; do
       REPLY="''${REPLY#$out/texmf}"
-      ensureDir $out/texmf-config/"$REPLY"
+      mkdir -p $out/texmf-config/"$REPLY"
     done
 
     for i in $out/libexec/*/* :; do

pkgs/misc/tex/texlive/beamer.nix

@@ -10,9 +10,9 @@ rec {
   propagatedBuildInputs = [texLiveLatexXColor texLivePGF];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/
+    mkdir -p $out/share/
 
-    ensureDir $out/texmf-dist/tex/latex/beamer
+    mkdir -p $out/texmf-dist/tex/latex/beamer
     cp -r * $out/texmf-dist/tex/latex/beamer 
 
     ln -s $out/texmf* $out/share/

pkgs/misc/tex/texlive/cm-super.nix

@@ -8,17 +8,17 @@ rec {
 
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/
+    mkdir -p $out/share/
 
-    ensureDir $out/texmf/fonts/enc
-    ensureDir $out/texmf/fonts/map
-    ensureDir $out/texmf/fonts/type1/public/cm-super
+    mkdir -p $out/texmf/fonts/enc
+    mkdir -p $out/texmf/fonts/map
+    mkdir -p $out/texmf/fonts/type1/public/cm-super
     cp pfb/*.pfb $out/texmf/fonts/type1/public/cm-super
-    ensureDir $out/texmf/dvips/cm-super
+    mkdir -p $out/texmf/dvips/cm-super
     cp dvips/*.{map,enc}  $out/texmf/dvips/cm-super
     cp dvips/*.enc  $out/texmf/fonts/enc
     cp dvips/*.map  $out/texmf/fonts/map
-    ensureDir $out/texmf/dvipdfm/config
+    mkdir -p $out/texmf/dvipdfm/config
     cp dvipdfm/*.map  $out/texmf/dvipdfm/config
 
     ln -s $out/texmf* $out/share/

pkgs/misc/tex/texlive/context.nix

@@ -9,9 +9,9 @@ rec {
   buildInputs = [texLive];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/
+    mkdir -p $out/share/
 
-    ensureDir $out/texmf
+    mkdir -p $out/texmf
     cp -r * $out/texmf
 
     ln -s $out/texmf* $out/share/

pkgs/misc/tex/texlive/default.nix

@@ -18,10 +18,10 @@ rec {
   setupHook = ./setup-hook.sh;
 
   doMainBuild = fullDepEntry (''
-    ensureDir $out
-    ensureDir $out/nix-support
+    mkdir -p $out
+    mkdir -p $out/nix-support
     cp ${setupHook} $out/nix-support/setup-hook.sh
-    ensureDir $out/share
+    mkdir -p $out/share
     tar xf ${texmfSrc} -C $out --strip-components=1
     tar xf ${langTexmfSrc} -C $out --strip-components=1
 
@@ -45,7 +45,7 @@ rec {
 
   doPostInstall = fullDepEntry(''
     mv $out/bin $out/libexec
-    ensureDir $out/bin
+    mkdir -p $out/bin
     for i in "$out/libexec/"*"/"*; do
         test \( \! -d "$i" \) -a -x "$i" || continue
         echo -ne "#! $SHELL\\nexec $i \"\$@\"" >$out/bin/$(basename $i)
@@ -69,7 +69,7 @@ rec {
     #
     # I find it acceptable, hence the "|| true".
     echo "building format files..."
-    ensureDir "$out/texmf-var/web2c"
+    mkdir -p "$out/texmf-var/web2c"
     PATH="$PATH:$out/bin" fmtutil-sys --all || true
 
     PATH=$PATH:$out/bin mktexlsr $out/texmf*

pkgs/misc/tex/texlive/extra.nix

@@ -9,7 +9,7 @@ rec {
   buildInputs = [texLive];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share
+    mkdir -p $out/share
     cp -r texmf* $out/
     ln -s $out/texmf* $out/share
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];

pkgs/misc/tex/texlive/moderncv.nix

@@ -9,7 +9,7 @@ rec {
   buildInputs = [texLive unzip];
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/texmf/tex/latex/moderncv $out/texmf/doc $out/share
+    mkdir -p $out/texmf/tex/latex/moderncv $out/texmf/doc $out/share
     mv *.cls *.sty $out/texmf/tex/latex/moderncv/
     mv examples $out/texmf/doc/moderncv
     ln -s $out/texmf* $out/share/

pkgs/misc/tex/texlive/pgf.nix

@@ -12,8 +12,8 @@ rec {
 
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
-    ensureDir $out/share/
-    ensureDir $out/texmf/tex/generic/pgf
+    mkdir -p $out/share/
+    mkdir -p $out/texmf/tex/generic/pgf
     cp -r * $out/texmf/tex/generic/pgf
     ln -s $out/texmf* $out/share/
   '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];

pkgs/misc/tex/texlive/xcolor.nix

@@ -10,10 +10,10 @@ rec {
   phaseNames = ["doCopy"];
   doCopy = fullDepEntry (''
     export HOME=$PWD
-    ensureDir $out/share/
+    mkdir -p $out/share/
 
-    ensureDir $out/texmf/tex/latex/xcolor
-    ensureDir $out/texmf/dvips/xcolor
+    mkdir -p $out/texmf/tex/latex/xcolor
+    mkdir -p $out/texmf/dvips/xcolor
     latex xcolor.ins 
     cp *.sty *.def $out/texmf/tex/latex/xcolor
     cp *.pro $out/texmf/dvips/xcolor
@@ -25,7 +25,7 @@ rec {
     #latex xcolor.dtx
 
     rm *.sty *.pro *.ins *.def *.dtx
-    ensureDir $out/texmf/doc/latex-xcolor
+    mkdir -p $out/texmf/doc/latex-xcolor
     cp *  $out/texmf/doc/latex-xcolor
 
     ln -s $out/texmf* $out/share/

pkgs/misc/uboot/default.nix

@@ -32,11 +32,11 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp u-boot.bin $out
     cp u-boot u-boot.map $out
 
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp tools/{envcrc,mkimage} $out/bin
   '';
 

pkgs/misc/uboot/guruplug.nix

@@ -44,10 +44,10 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp -v u-boot u-boot.{kwb,map} $out
 
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp tools/{envcrc,mkimage} $out/bin
   '';
 }

pkgs/misc/uboot/nanonote.nix

@@ -50,11 +50,11 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp u-boot-nand.bin $out
     cp u-boot u-boot.map $out
 
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp tools/{envcrc,mkimage} $out/bin
   '';
 }

pkgs/misc/uboot/sheevaplug.nix

@@ -47,11 +47,11 @@ stdenv.mkDerivation {
   dontStrip = true;
 
   installPhase = ''
-    ensureDir $out
+    mkdir -p $out
     cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out
     cp u-boot u-boot.map $out
 
-    ensureDir $out/bin
+    mkdir -p $out/bin
     cp tools/{envcrc,mkimage} $out/bin
   '';
 }