diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
commit | c556a6ea46e71e1907d78b71fab36df30297b3ad (patch) | |
tree | 91a51d04a39ab4db1fb5182b56ce63cf9d9779b9 /pkgs | |
parent | f7159c195a623c311829c38c40ef010ac6e943f7 (diff) |
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
Diffstat (limited to 'pkgs')
627 files changed, 926 insertions, 926 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c9f0fb98af73e..2a0caf930015a 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 bdda1c6d8d96c..e75be3e2c2bef 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 7f062b1799fae..8e7f573cc8499 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 1557913f40172..b563c850d5286 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 8cd3dcc1bfbaa..30ba34af16c52 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 86ffca4242fa2..d5a8138a50014 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 4ea26b458a7c0..ccaa428a3f41e 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 e7957e866f1a0..c295767687f6e 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 d3ac4c4168c8f..3a2beff041332 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 b751e4da33ed1..279820a723fb1 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 528f0b3412c18..0cfbfb4c9bd16 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 ''; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index bc53dfc70f329..801efc166daa5 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -27,7 +27,7 @@ let buildCommand = '' # Unpack tarball. - ensureDir $out + mkdir -p $out tar xfvz $src -C $out # Patch binaries. @@ -47,7 +47,7 @@ let --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; # */ diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 511e284ed39e0..e1d2ad69b1dd6 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -15,16 +15,16 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 ''; installPhase = '' - ensureDir $out/bin $out/share/elvis $out/share/elvis/doc + mkdir -p $out/bin $out/share/elvis $out/share/elvis/doc cp elvis ref elvtags elvfmt $out/bin cp -R data/* $out/share/elvis cp doc/* $out/share/elvis/doc - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 for a in doc/*.man; do cp $a $out/share/man/man1/`basename $a .man`.1 done diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index 52afebc6297bb..ec7a3e8e6002e 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [emacs texinfo ctags]; configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; - preInstall = "ensureDir $out/info"; + preInstall = "mkdir -p $out/info"; installTargets = "install-pkg texinfo"; postInstall = '' mv $out/info $out/share/ diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 6a91ac496517c..46381dfc648d7 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { checkPhase = "make utest"; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp" chmod a-x "$out/share/emacs/site-lisp/"* - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v */*.info* */*/*.info* "$out/share/info" ''; diff --git a/pkgs/applications/editors/emacs-modes/ecb/default.nix b/pkgs/applications/editors/emacs-modes/ecb/default.nix index 258c13b8eb70e..f94d594519ced 100644 --- a/pkgs/applications/editors/emacs-modes/ecb/default.nix +++ b/pkgs/applications/editors/emacs-modes/ecb/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -rv *.el *.elc ecb-images "$out/share/emacs/site-lisp" - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v info-help/*.info* "$out/share/info" ''; diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index 3a97703143663..5439ba9e4d6eb 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { s|/usr/include/taglib|${taglib}/include/taglib|g ; s|/usr/lib|${taglib}/lib|g ; s|^all:\(.*\)\$|all:\1 emms-print-metadata|g" - ensureDir "$out/share/man/man1" + mkdir -p "$out/share/man/man1" sed -i "emms-player-mpg321-remote.el" \ -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g' @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ensureDir "$out/bin" && cp emms-print-metadata "$out/bin" + mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin" ''; meta = { diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 5813fde815f8c..b73d91b611c83 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [emacs]; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" ''; diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix index 9dba1d599fff4..24eba20be6cc5 100644 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { installPhase = '' DEST=$out/share/emacs/site-lisp - ensureDir $DEST + mkdir -p $DEST cp -a * $DEST ''; diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 2d93e782048a6..02f60d0d698d5 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -23,7 +23,7 @@ in ]; configurePhase = '' - ensureDir "dist" + mkdir -p "dist" cat > build.properties <<EOF dist.lisp.dir = dist/share/emacs/site-lisp dist.java.lib.dir = dist/lib/java @@ -50,7 +50,7 @@ in installPhase = '' ant install - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -rv java/bsh-commands "$out/share/${name}" # Move everything that's not a JAR to $datadir. This includes diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix index 18ea2797bec56..f0a5198793702 100644 --- a/pkgs/applications/editors/emacs-modes/org/default.nix +++ b/pkgs/applications/editors/emacs-modes/org/default.nix @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { installPhase = '' make install install-info - ensureDir "$out/share/doc/${name}" + mkdir -p "$out/share/doc/${name}" cp -v doc/org*.{html,pdf,txt} "$out/share/doc/${name}" - ensureDir "$out/share/org" + mkdir -p "$out/share/org" cp -R contrib "$out/share/org/contrib" ''; diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix index 317f121f36488..86371890db153 100644 --- a/pkgs/applications/editors/emacs-modes/quack/default.nix +++ b/pkgs/applications/editors/emacs-modes/quack/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildPhase = '' emacsDir="$out/share/emacs/site-lisp" - ensureDir "$emacsDir" + mkdir -p "$emacsDir" cp -v "$src" "$emacsDir/quack.el" emacs --batch -f batch-byte-compile "$emacsDir/quack.el" ''; diff --git a/pkgs/applications/editors/emacs-modes/rudel/default.nix b/pkgs/applications/editors/emacs-modes/rudel/default.nix index 9bb7870fb5a12..787f5df6eb049 100644 --- a/pkgs/applications/editors/emacs-modes/rudel/default.nix +++ b/pkgs/applications/editors/emacs-modes/rudel/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation installPhase = '' for n in . obby zeroconf jupiter; do - ensureDir "$out/share/emacs/site-lisp/$n"; + mkdir -p "$out/share/emacs/site-lisp/$n"; cp $n/*.el "$out/share/emacs/site-lisp/$n/"; done install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf" diff --git a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix index 3b6361b9ef76d..71a2993aba818 100644 --- a/pkgs/applications/editors/emacs-modes/scala-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/scala-mode/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ emacs ]; installPhase = - '' ensureDir "$out/share/emacs/site-lisp" + '' mkdir -p "$out/share/emacs/site-lisp" cp -v *.el *.elc "$out/share/emacs/site-lisp" ''; diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index c78d40bcb5fe8..08fb64002a097 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [emacs]; installPhase = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp lisp/*.el "$out/share/emacs/site-lisp/" ''; diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 5349f10c0c36d..194f13a090cd8 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/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 ''; diff --git a/pkgs/applications/editors/jedit/wrapper.nix b/pkgs/applications/editors/jedit/wrapper.nix index 8af3d96918d8f..1126a7278d6cd 100644 --- a/pkgs/applications/editors/jedit/wrapper.nix +++ b/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 \\$* diff --git a/pkgs/applications/editors/nedit/builder.sh b/pkgs/applications/editors/nedit/builder.sh index 51b5f1836546b..15706b0c37dd2 100644 --- a/pkgs/applications/editors/nedit/builder.sh +++ b/pkgs/applications/editors/nedit/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp -p source/nedit source/nc $out/bin } diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index c759f977b0d48..81e0dd35db950 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/share/vi/catalog + mkdir -p $out/bin $out/share/vi/catalog for a in dutch english french german ru_SU.KOI8-R spanish swedish; do cp ../catalog/$a $out/share/vi/catalog done @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ln -s $out/bin/nvi $out/bin/ex ln -s $out/bin/nvi $out/bin/view - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp ../docs/USD.doc/vi.man/vi.1 $out/share/man/man1/nvi.1 ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/vi ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 3c900ca1eba24..b80d27bfcf9b3 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 795417dbf5b35..2557f0f82e58c 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 7c3826369ee98..dc397a614d3d5 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 8ddaf9bc2792a..9b39d8e8f1f7b 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 8f7ba7929147a..e3c6deddb2954 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 12f01adc83005..349982bc24cb3 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 eda187cbf2358..4b61ac740cb90 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 b40a725128317..6d39c7f2a95fe 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 a746eb86b940e..307c947792961 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; diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index cd4bebfe9ad0f..1f4844a22c46e 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup echo "unpacking $src..." tar xvfa $src -ensureDir $out/Adobe/Reader9 +mkdir -p $out/Adobe/Reader9 echo "unpacking reader..." set +e @@ -24,5 +24,5 @@ substituteInPlace $out/Adobe/Reader*/bin/acroread \ --replace /bin/ls $(type -P ls) \ --replace xargs "xargs -r" -ensureDir $out/bin +mkdir -p $out/bin ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index ab22312e9033f..caaa5133c754e 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ snack tcl tk makeWrapper ]; installPhase = '' - ensureDir $out/{bin,nix-support,share/wavesurfer/} + mkdir -p $out/{bin,nix-support,share/wavesurfer/} mv doc $out/share/wavesurfer mv * $out/nix-support ln -s $out/{nix-support,bin}/wavesurfer.tcl diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index d56ebe6b17f1e..de74cd6abd9a6 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bitcoin-qt $out/bin cp src/bitcoind $out/bin ''; diff --git a/pkgs/applications/misc/blender/2.49.nix b/pkgs/applications/misc/blender/2.49.nix index 6a66c45b94fc8..b27f60e9bffa2 100644 --- a/pkgs/applications/misc/blender/2.49.nix +++ b/pkgs/applications/misc/blender/2.49.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin/* $out/bin ''; diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index 24071d3c68380..f67138e66a771 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { # JDK 7 beta seems to have fixed this (bug ?) installPhase = '' - ensureDir $out/{bin,nix-support} + mkdir -p $out/{bin,nix-support} cp -r ../bin/dist $out/nix-support sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh cat > $out/bin/freemind << EOF diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 1a0453797ccd5..0e222366729f4 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { buildInputs = [makeWrapper perl]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp get_iplayer $out/bin wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin ''; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index aa4807a34f5ae..8da4e9de8fd63 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ''; installPhase ='' - ensureDir $out/{opt/googleearth/,bin}; + mkdir -p $out/{opt/googleearth/,bin}; tar xf googleearth-data.tar -C $out/opt/googleearth tar xf googleearth-linux-x86.tar -C $out/opt/googleearth cp bin/googleearth $out/opt/googleearth diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 56c547ce43570..70cd5d3faf4b3 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo > "$out/bin/${pname}" "#!/bin/sh" echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" chmod +x "$out/bin/${pname}" diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 08edc32e87e14..9ea5f18ee6297 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { unpackPhase = "sh ${src}"; installPhase = '' cd ${name} - ensureDir $out/{bin,share/{${name},man/man1}} + mkdir -p $out/{bin,share/{${name},man/man1}} mv makeself.lsm README $out/share/${name} mv makeself.sh $out/bin/makeself mv makeself.1 $out/share/man/man1/ diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index e308ebe04774c..a526774d48ecf 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/share/${name}/Icons + mkdir -p $out/bin $out/share/${name}/Icons cp bin/NaviPOWM $out/bin cp ../../common/Config/navipowm.ini $out/share/${name} cp ../../common/Images/* $out/share/${name} diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index 3b42f0f33221a..74f657ee02a78 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # error. Still this is better than getting it always. # TODO: build from source and patch this unpackPhase = '' - ensureDir $out/bin; + mkdir -p $out/bin; cd $out; unzip $src s=$out/bin/OpenJump dir=$(echo $out/openjump-*) diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 15bcc477bdd31..7b25f9fc5c773 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { # getline is defined differently in glibc now. So rename it. installPhase = " - ensureDir \$out/bin + mkdir -p \$out/bin sed -e \"s%^RM.*$%RM=`type -f rm | awk '{print $3;}'` -f%\" -i Makefile sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix index 67d3f32d53feb..6f5c775cfb335 100644 --- a/pkgs/applications/misc/pstree/default.nix +++ b/pkgs/applications/misc/pstree/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { unpackPhase = "unpackFile \$src; sourceRoot=."; buildPhase = "pwd; gcc -o pstree pstree.c"; - installPhase = "ensureDir \$out/bin; cp pstree \$out/bin"; + installPhase = "mkdir -p \$out/bin; cp pstree \$out/bin"; meta = { description = "Show the set of running processes as a tree"; diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index 233ee0e655107..ee8876e6b334c 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { # probably there is more to be done. But this seems to work for now (eg see gentoo ebuild) installPhase = '' - ensureDir $out/{bin,share} + mkdir -p $out/{bin,share} cp -r qcad $out/share # The compilation does not fail with error code. But qcad will not exist diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 89bce3ff99f25..aa8b1b2b29f4a 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (rec { '' # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically + stdenv.lib.optionalString perlSupport '' - ensureDir $out/lib/perl5 + mkdir -p $out/lib/perl5 ln -s $out/{lib/urxvt,lib/perl5/site_perl} ''; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index c14f6080b8ca1..495f37de2f40a 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { buildPhase = "./mk"; installPhase = '' - ensureDir $out/{bin,share/sbagen/doc} + mkdir -p $out/{bin,share/sbagen/doc} cp -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg cp sbagen $out/bin cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index 2faed53b7a585..7b55f39c11916 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ls -1 bin/* | grep -ve 'bin/tr''$' | xargs rm # don't keep the other .exe file either find . -iname "*.exe" | xargs -n1 rm - ensureDir $out/{nix-support/tr-files,bin} + mkdir -p $out/{nix-support/tr-files,bin} cp -r . $out/nix-support/tr-files cat >> $out/bin/thinkingrock << EOF #!/bin/sh diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index 3f536ec21c171..8caa86a71cbe3 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -31,7 +31,7 @@ rec { doDeploy = a.fullDepEntry '' unzip ${src} - ensureDir "$out"/{share/vue,bin} + mkdir -p "$out"/{share/vue,bin} cp VUE.jar "$out/share/vue/vue.jar" echo '#!${a.stdenv.shell}' >> "$out/bin/vue" echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index 589fbf497866d..7987d26946d51 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation { ]; installPhase = '' - ensureDir $out/lib/goo - ensureDir $out/lib/fofi - ensureDir $out/lib/xpdf - ensureDir $out/include + mkdir -p $out/lib/goo + mkdir -p $out/lib/fofi + mkdir -p $out/lib/xpdf + mkdir -p $out/include cp -v goo/libGoo.a $out/lib/goo cp -v fofi/libfofi.a $out/lib/fofi diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 0be1d4dc48dae..66c0f039403d6 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -42,8 +42,8 @@ stdenv.mkDerivation rec { ]; installPhase = '' - ensureDir $out/bin - ensureDir $out/libexec/chrome + mkdir -p $out/bin + mkdir -p $out/libexec/chrome cp -R * $out/libexec/chrome diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index b6ec69ee38886..1b8fb796badd6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { --suffix-each LD_LIBRARY_PATH ':' "$libs" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" - ensureDir $out/share/applications + mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications ''; diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index 99f135c6d7b45..7fc5ddbcce51e 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation { fi # Put the GNU IceCat icon in the right place. - ensureDir "$out/lib/$libDir/chrome/icons/default" + mkdir -p "$out/lib/$libDir/chrome/icons/default" ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/" ''; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh index 4db487f5c51c0..b0f8a2638c188 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh @@ -15,7 +15,7 @@ unpackPhase() { } installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh index 4db487f5c51c0..b0f8a2638c188 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh @@ -15,7 +15,7 @@ unpackPhase() { } installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh index 0f738eb9cccc8..86ecd2c334537 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh @@ -6,7 +6,7 @@ dontPatchELF=1 sourceRoot=. installPhase() { - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index 890021b33d6e1..37d5cbe039f1f 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -22,7 +22,7 @@ rec { '') ["doUnpack" "minInit"]; postInstall = a.fullDepEntry('' - ensureDir $out/share/${name}/plugin + mkdir -p $out/share/${name}/plugin ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin '') ["doMakeInstall" "minInit" "defEnsureDir"]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 330fac098620f..6ee1735f76c76 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ]; installPhase = '' - ensureDir $out/lib/mozilla/plugins + mkdir -p $out/lib/mozilla/plugins cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins ''; diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix index 7728f7abcfc52..6a86774226d38 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix @@ -46,7 +46,7 @@ rec { }; } // (if externalPurple2 then { postInstall = fullDepEntry ('' - ensureDir $out/lib/purple-2 + mkdir -p $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } else {}) diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 0428ccdc7f32c..58f65a2709ec2 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -46,7 +46,7 @@ rec { }; } // (if externalPurple2 then { postInstall = fullDepEntry ('' - ensureDir $out/lib/purple-2 + mkdir -p $out/lib/purple-2 cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ '') ["minInit" "defEnsureDir"]; } else {}) diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 37f56a6380681..026ab3fff1c5c 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -59,14 +59,14 @@ rec { doDeploy = a.fullDepEntry '' TARGET_DIR="$out/share/oneteam/app" BUILD_DIR="$PWD" - ensureDir "$TARGET_DIR" + mkdir -p "$TARGET_DIR" cd "$TARGET_DIR" unzip "$BUILD_DIR/oneteam.xulapp" - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam" echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam" chmod a+x "$out/bin/oneteam" - ensureDir "$out/share/doc" + mkdir -p "$out/share/doc" cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam" '' ["defEnsureDir"]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix index 5e5cf311712a1..cdbf63dbd9f13 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out"; - preInstall = "ensureDir \$out/share"; + preInstall = "mkdir -p \$out/share"; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan"; buildInputs = [pidgin]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix index cc6901c0384dd..868b5dbb342b8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix @@ -12,7 +12,7 @@ rec { ]; preBuild = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin ln -s $(which convert) $out/bin ln -s $(which xelatex) $out/bin ln -s $(which dvips) $out/bin @@ -26,8 +26,8 @@ rec { '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"]; postInstall = fullDepEntry ('' - ensureDir $out/lib - ensureDir $out/share/pidgin-latex + mkdir -p $out/lib + mkdir -p $out/share/pidgin-latex ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex '') ["minInit" "defEnsureDir" "doMakeInstall"]; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index b0819da4c6e52..7d04d9e9fec71 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -27,10 +27,10 @@ stdenv.mkDerivation rec { postInstall = '' PSI_PLUGINS="$out/lib/psi/plugins" - ensureDir "$PSI_PLUGINS" + mkdir -p "$PSI_PLUGINS" ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS" PSI_QT_PLUGINS="$out/share/psi" - ensureDir "$PSI_QT_PLUGINS"/crypto + mkdir -p "$PSI_QT_PLUGINS"/crypto ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto ''; diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix index 5f6112b53d081..4574b5a9b3548 100644 --- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix +++ b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postBuild = '' TARGET="$out/share/psi/plugins" - ensureDir "$TARGET" + mkdir -p "$TARGET" cp gstprovider/*.so "$TARGET"/ ''; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 440ab624a6233..5a82cf9d6407e 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms - ensureDir $out/lib/torchat + mkdir -p $out/lib/torchat cp -rf * $out/lib/torchat makeWrapper ${python}/bin/python $out/bin/torchat \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index ce9e84fd5724d..8ddf784adc04f 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp iptraf $out/bin ''; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix index 62b4d91de587c..717d4012645d0 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/9.x.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { --replace /bin/ls "$(type -tP ls)" # Create a desktop item. - ensureDir $out/share/applications + mkdir -p $out/share/applications cat > $out/share/applications/thunderbird.desktop <<EOF [Desktop Entry] Type=Application diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 5c9e215f87644..e736d561cb412 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional jackSupport jackaudio); installPhase = '' - ensureDir $out + mkdir -p $out cp -r ./release $out/bin ''; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index 9784d36927100..ea994c889e2ff 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "offrss-1.1"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp offrss $out/bin ''; diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index f189d2eb7813f..1b601992aa6f0 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -12,7 +12,7 @@ with builderDefs; openssl libX11 boost]; configureFlags = []; doScons = fullDepEntry ('' - ensureDir $out + mkdir -p $out export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; for i in gettext xgettext msgfmt msgcat; do diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 98abc0a3db7af..145414e5c3d32 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (rec { # Byte code compilation (the ocaml opt compiler is not supported in many platforms) buildPhase = "make mlnet.byte"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp mlnet.byte $out/bin/mlnet ''; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 14bc1ead49b28..2dc909ca91577 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libsamplerate ]; postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin cp pjsip-apps/bin/pjsua-* $out/bin/pjsua - ensureDir $out/share/${name}/samples + mkdir -p $out/share/${name}/samples cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples ''; diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix index 8d3645e38195c..1eef323ae057f 100644 --- a/pkgs/applications/networking/skype/default.nix +++ b/pkgs/applications/networking/skype/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; installPhase = '' - ensureDir $out/{opt/skype/,bin} + mkdir -p $out/{opt/skype/,bin} cp -r * $out/opt/skype/ fullPath= @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { --- > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png EOF - ensureDir $out/share/applications + mkdir -p $out/share/applications mv skype.desktop $out/share/applications ''; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 06bab807ebdd4..e3b042aa810e1 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (rec { makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") + (if ! nativeCode then " NATIVE=false" else ""); - preInstall = "ensureDir $out/bin"; + preInstall = "mkdir -p $out/bin"; postInstall = if enableX11 then '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index b20f862842c8b..69a0a7efde83c 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/{bin,sbin} $out/share/man/{man1,man5} + mkdir -p $out/{bin,sbin} $out/share/man/{man1,man5} cp src/vnstat $out/bin cp src/vnstatd $out/sbin cp man/vnstat.1 man/vnstatd.1 $out/share/man/man1 diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index aa09b48ab2785..f1de422fa249b 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -25,7 +25,7 @@ in ''; installPhase = '' - ensureDir "$out/bin" "$out/share/doc/impressive" + mkdir -p "$out/bin" "$out/share/doc/impressive" mv impressive.py "$out/bin/impressive" mv * "$out/share/doc/impressive" diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index 1e7aa756471f1..d56f4bed0ce9e 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -19,7 +19,7 @@ in ''; installPhase = '' - ensureDir $out/opt/mmex + mkdir -p $out/opt/mmex cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex ''; diff --git a/pkgs/applications/office/openoffice/builder.sh b/pkgs/applications/office/openoffice/builder.sh index 131e85de5bf66..2c6e04e049be5 100644 --- a/pkgs/applications/office/openoffice/builder.sh +++ b/pkgs/applications/office/openoffice/builder.sh @@ -70,7 +70,7 @@ installPhase() { -f openoffice.lst -l en-US -p OpenOffice \ -buildid $BUILD -simple $ooFiles) - ensureDir $out/bin + mkdir -p $out/bin for i in soffice ooffice; do wrapSOffice $i; done # Create some wrappers to start individual OpenOffice components. @@ -78,7 +78,7 @@ installPhase() { # Create symlinks to desktop files, so that openoffice.org apps can be picked from # the application menu in KDE and GNOME - ensureDir $out/share + mkdir -p $out/share ln -s $out/lib/openoffice/openoffice.org3/share/xdg $out/share/applications # Apply a minor correction to the *.desktop files in order to correctly address the icons diff --git a/pkgs/applications/office/openoffice/get-go-src.nix b/pkgs/applications/office/openoffice/get-go-src.nix index ebdb586bd47a4..439da36638103 100644 --- a/pkgs/applications/office/openoffice/get-go-src.nix +++ b/pkgs/applications/office/openoffice/get-go-src.nix @@ -28,7 +28,7 @@ lib.overrideDerivation go_oo (attrs: { makesh = '' sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download - ensureDir $out + mkdir -p $out set +e ./download --all | grep XXX | diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix index 241c2ff2a130e..59cd517b55cd7 100644 --- a/pkgs/applications/office/openoffice/go-oo.nix +++ b/pkgs/applications/office/openoffice/go-oo.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { installPhase = '' bin/ooinstall $out - ensureDir $out/bin + mkdir -p $out/bin for a in $out/program/{sbase,scalc,sdraw,simpress,smath,soffice,swriter,soffice.bin}; do ln -s $a $out/bin done diff --git a/pkgs/applications/science/biology/arb/default.nix b/pkgs/applications/science/biology/arb/default.nix index 4543fce48160b..1b4563555c468 100644 --- a/pkgs/applications/science/biology/arb/default.nix +++ b/pkgs/applications/science/biology/arb/default.nix @@ -33,22 +33,22 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib shareddir=/nix/var/lib/arb # link out writable shared location lib/pts - ensureDir $shareddir/lib/pts + mkdir -p $shareddir/lib/pts cp -vau lib/pts $shareddir/lib rm -vrf lib/pts ln -vs $shareddir/lib/pts $out/lib/pts chmod a+rwx $shareddir/lib/pts # link out writable shared location lib/nas/ - ensureDir $shareddir/lib/nas + mkdir -p $shareddir/lib/nas cp -vau lib/nas $shareddir/lib rm -vrf lib/nas ln -vs $shareddir/lib/nas $out/lib/nas chmod a+rwx $shareddir/lib/nas # link out shared lib/pixmaps (not sure about this, yet): - ensureDir $shareddir/lib/pixmaps + mkdir -p $shareddir/lib/pixmaps cp -vau lib/pixmaps $shareddir/lib rm -vrf lib/pixmaps ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps diff --git a/pkgs/applications/science/biology/pal2nal/default.nix b/pkgs/applications/science/biology/pal2nal/default.nix index ff9e35d921644..956f8b07e9898 100644 --- a/pkgs/applications/science/biology/pal2nal/default.nix +++ b/pkgs/applications/science/biology/pal2nal/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -v pal2nal.pl $out/bin - ensureDir $out/doc + mkdir -p $out/doc cp -v README $out/doc ''; diff --git a/pkgs/applications/science/biology/slr/default.nix b/pkgs/applications/science/biology/slr/default.nix index 981cf2a670316..629c10aecdff6 100644 --- a/pkgs/applications/science/biology/slr/default.nix +++ b/pkgs/applications/science/biology/slr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { make -fMakefile.linux ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp -v ../Slr $out/bin ''; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index a5c3466d57bce..a43ec3b0eb9f6 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp tetgen $out/bin ''; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 63040b7fdd52b..5552fadc55598 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [polyml]; buildCommand = '' - ensureDir "$out/src" + mkdir -p "$out/src" cd "$out/src" tar -xzf "$src" @@ -28,7 +28,7 @@ stdenv.mkDerivation { bin/build -expk -symlink - ensureDir "$out/bin" + mkdir -p "$out/bin" ln -st $out/bin $out/src/hol/bin/* # ln -s $out/src/hol/bin $out/bin ''; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 4961bbeabfd1b..0e688e71a2e57 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir "$out/lib/hol_light" "$out/bin" + mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light echo "${start_script}" > "$out/bin/hol_light" chmod a+x "$out/bin/hol_light" diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index 7bfd8dff12e30..91d8c122a8d4f 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -30,10 +30,10 @@ rec { phaseNames = ["doConfigure" "doMake" "doDeploy"]; configureCommand = "sh configure"; doDeploy = a.fullDepEntry ('' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp iproveropt "$out/bin" - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp *.p "$out/share/${name}" echo -e "#! /bin/sh\\n$out/bin/iproveropt --clausifier \"${eprover}/bin/eprover\" --clausifier_options \" --tstp-format --silent --cnf \" \"\$@\"" > "$out"/bin/iprover chmod a+x "$out"/bin/iprover diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 7cfe5f927363e..4a268cac64557 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin mv $TMP/$name $out cd $out/$name bin/isabelle install -p $out/bin diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 04ab9a5b5ab3a..6b17d7e8f50a6 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -29,17 +29,17 @@ rec { phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"]; makeInstallationDir = a.fullDepEntry ('' - ensureDir "$out/share/leo2/build-dir" + mkdir -p "$out/share/leo2/build-dir" cd "$out/share/leo2/build-dir" '') ["minInit" "defEnsureDir"]; goSrcDir = "cd src/"; doFinalize = a.fullDepEntry ('' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo -e "#! /bin/sh\\n$PWD/../bin/leo --atprc $out/etc/leoatprc \"\$@\"\\n" > "$out/bin/leo" chmod a+x "$out/bin/leo" - ensureDir "$out/etc" + mkdir -p "$out/etc" echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc" '') ["minInit" "doMake" "defEnsureDir"]; diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 92e9479d9a442..0713ff09e9299 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin ''; diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 34a6bd7ceff34..1f29b3aa1a112 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["setVars" "doMake" "doDeploy"]; goSrcDir = "cd simp"; doDeploy = a.fullDepEntry ('' - ensureDir "$out"/bin + mkdir -p "$out"/bin cp minisat_static "$out/bin"/minisat '') ["minInit" "defEnsureDir"]; makeFlags = ["rs"]; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 5a92c103961c1..970daf739fca8 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out"/bin + mkdir -p "$out"/bin cp picomus "$out"/bin cp picosat "$out"/bin - ensureDir "$out"/lib + mkdir -p "$out"/lib cp libpicosat.a "$out"/lib cp libpicosat.so "$out"/lib - ensureDir "$out"/include/picosat + mkdir -p "$out"/include/picosat cp picosat.h "$out"/include/picosat ''; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 129abef0b3d74..7ac3831f6a560 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildFlags = "all"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin/* $out/bin ''; diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index 4bf6e53737e94..2126a4d76d635 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -34,21 +34,21 @@ rec { make ) - ensureDir "$out/bin" + mkdir -p "$out/bin" cp minisat/simp/minisat "$out/bin" echo "(setq *minisat-binary* \"$out/bin/minisat\")" > config.lisp '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; doDeploy = a.fullDepEntry ('' - ensureDir "$out/share/satallax/build-dir" + mkdir -p "$out/share/satallax/build-dir" cp -r * "$out/share/satallax/build-dir" cd "$out/share/satallax/build-dir" sbcl --load make.lisp ! ( ./test | grep ERROR ) - ensureDir "$out/bin" + mkdir -p "$out/bin" cp bin/satallax "$out/bin" '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"]; diff --git a/pkgs/applications/science/logic/ssreflect/default.nix b/pkgs/applications/science/logic/ssreflect/default.nix index 5a51fe2136a1f..8443974a0a0aa 100644 --- a/pkgs/applications/science/logic/ssreflect/default.nix +++ b/pkgs/applications/science/logic/ssreflect/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { installPhase = '' COQLIB=$out/lib/coq make -f Makefile.coq install -e - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 3211b6ebdc01e..11b8f7ce535a5 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -31,7 +31,7 @@ rec { "patchBinaries" "makeLinks"]; goTarget = a.fullDepEntry '' - ensureDir "$out"/share/ + mkdir -p "$out"/share/ cd "$out"/share/ '' ["defEnsureDir" "minInit"]; @@ -54,7 +54,7 @@ rec { '' ["addInputs"]; makeLinks = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" ln -s "../share/tptp/TPTP2X/tptp2X" "$out/bin" ln -s "../share/tptp/Scripts/tptp2T" "$out/bin" ln -s "../share/tptp/Scripts/tptp4X" "$out/bin" diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix index 15abc928f0fb3..87c047c299573 100644 --- a/pkgs/applications/science/math/content/default.nix +++ b/pkgs/applications/science/math/content/default.nix @@ -77,7 +77,7 @@ rec { '') ["addInputs" "buildVibrant" "setPlatform"]; install = a.fullDepEntry ('' - ensureDir $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc + mkdir -p $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc find . -name '*.o' -exec cp '{}' $out/lib ';' find . -name '*.so' -exec cp '{}' $out/lib ';' find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';' diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 9f65bcb8c1480..d15bed8476e7a 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [bison flex texinfo readline texLive]; preConfigure = "sed -i 's/ginstall-info/install-info/g' doc/Makefile"; - installPhase = "ensureDir $out/bin ; make PREFIX=$out install"; + installPhase = "mkdir -p $out/bin ; make PREFIX=$out install"; meta = { description = "Geometry Drawing Language"; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 02b7017d2953f..0d3a12b38c288 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { wrapProgram "$prog" --prefix PATH ":" "${searchPath}" done # Move emacs modules and documentation into the right place. - ensureDir $out/share/emacs $out/share/doc + mkdir -p $out/share/emacs $out/share/doc ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index baee2f23d4ca6..c8b388a06b78a 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { else if stdenv.system == "i686-linux" then "x86" else "generic"; - installPhase = ''ensureDir $out/bin/ + installPhase = ''mkdir -p $out/bin/ cp msieve $out/bin/''; meta = { diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index dfc97eca8ebeb..5c5dfae8200f7 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -37,7 +37,7 @@ rec { fixInstall = a.fullDepEntry ('' rm -rf "$out/LIB" cp -r Singular/LIB "$out" - ensureDir "$out/bin" + mkdir -p "$out/bin" ln -s "$out"/*/Singular "$out/bin" '') ["minInit" "defEnsureDir"]; diff --git a/pkgs/applications/taxes/aangifte-2005/builder.sh b/pkgs/applications/taxes/aangifte-2005/builder.sh index e6b2bb8787ec3..8d284176d4447 100644 --- a/pkgs/applications/taxes/aangifte-2005/builder.sh +++ b/pkgs/applications/taxes/aangifte-2005/builder.sh @@ -10,7 +10,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh index e6b2bb8787ec3..8d284176d4447 100644 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ b/pkgs/applications/taxes/aangifte-2006/builder.sh @@ -10,7 +10,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh index e89ba5ae36ff9..f400f1b8855bd 100644 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ b/pkgs/applications/taxes/aangifte-2007/builder.sh @@ -12,7 +12,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh index e89ba5ae36ff9..f400f1b8855bd 100644 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ b/pkgs/applications/taxes/aangifte-2008/builder.sh @@ -12,7 +12,7 @@ buildPhase() { } installPhase() { - ensureDir $out + mkdir -p $out cp -prvd * $out/ } diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index 231670d263b5e..eeeb4a1d1e535 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin ''; diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index cd8a3b62269b8..65ff561ee9ef6 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin ''; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 7b84dcecb6384..325d2e77e1a34 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { checkTarget = "test"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin INSTALLDIR=$out/bin make install ''; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 45860362433f4..44e9cd535be6f 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { installPhase = '' sed -i "s@/usr/bin/env.*@$(type -p python)@" *.py l=$out/libexec/git-fast-export - ensureDir $out/{bin,doc/git-fast-export} $l + mkdir -p $out/{bin,doc/git-fast-export} $l mv *.txt $out/doc/git-fast-export sed -i "s@ROOT=.*@ROOT=$l@" *.sh mv *.sh $out/bin diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 795d43da6da4f..f22fbd102c78f 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -42,11 +42,11 @@ stdenv.mkDerivation { } # Install contrib stuff. - ensureDir $out/share/git + mkdir -p $out/share/git mv contrib $out/share/git/ - ensureDir $out/share/emacs/site-lisp + mkdir -p $out/share/emacs/site-lisp ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/ - ensureDir $out/etc/bash_completion.d + mkdir -p $out/etc/bash_completion.d ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/ # grep is a runtime dependence, need to patch so that it's found diff --git a/pkgs/applications/version-management/git-and-tools/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix index a3b2a60953a59..6371e504bfb26 100644 --- a/pkgs/applications/version-management/git-and-tools/git/git-git.nix +++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { '' # Install Emacs mode. echo "installing Emacs mode..." - ensureDir $out/share/emacs/site-lisp + mkdir -p $out/share/emacs/site-lisp cp -p contrib/emacs/*.el $out/share/emacs/site-lisp wrapArgs= @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { + ''# install bash completion script d="$out/etc/bash_completion.d" - ensureDir $d; cp contrib/completion/git-completion.bash "$d" + mkdir -p $d; cp contrib/completion/git-completion.bash "$d" ''; meta = { diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 7d622c4067c15..a933ae84e603d 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { makeFlags = "prefix=$$out"; postInstall = '' - ensureDir "$out/etc/bash_completion.d/" + mkdir -p "$out/etc/bash_completion.d/" ln -s ../../share/stgit/completion/stgit-completion.bash "$out/etc/bash_completion.d/" ''; diff --git a/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/pkgs/applications/version-management/git-and-tools/topgit/default.nix index ef8bb1b4dcfde..4b19260518223 100644 --- a/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation { configurePhase = "export prefix=$out"; postInstall = '' - ensureDir "$out/share/doc/topgit-${version}" + mkdir -p "$out/share/doc/topgit-${version}" cp README "$out/share/doc/topgit-${version}/" - ensureDir "$out/etc/bash_completion.d" + mkdir -p "$out/etc/bash_completion.d" make prefix="$out" install mv "contrib/tg-completion.bash" "$out/etc/bash_completion.d/" ''; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 8d4a45a496c43..a5e4eb8e280ad 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { postInstall = (stdenv.lib.optionalString guiSupport '' - ensureDir $out/etc/mercurial + mkdir -p $out/etc/mercurial cp contrib/hgk $out/bin cat >> $out/etc/mercurial/hgrc << EOF [extensions] @@ -40,7 +40,7 @@ stdenv.mkDerivation { done # copy hgweb.cgi to allow use in apache - ensureDir $out/share/cgi-bin + mkdir -p $out/share/cgi-bin cp -v hgweb.cgi $out/share/cgi-bin chmod u+x $out/share/cgi-bin/hgweb.cgi ''; diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 70dd669e30fd3..cde31b5cef97b 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { buildInputs = [boost zlib botan libidn lua pcre sqlite pkgconfig]; postInstall = '' - ensureDir $out/share/${name} + mkdir -p $out/share/${name} cp -rv contrib/ $out/share/${name}/contrib - ensureDir $out/lib/perl5/site_perl/${perlVersion} + mkdir -p $out/lib/perl5/site_perl/${perlVersion} cp -v contrib/Monotone.pm $out/lib/perl5/site_perl/${perlVersion} ''; diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix index b4aa63ed01480..91650deb077d3 100644 --- a/pkgs/applications/version-management/veracity/default.nix +++ b/pkgs/applications/version-management/veracity/default.nix @@ -37,10 +37,10 @@ rec { '' else "") ["doMake" "minInit"]; prepare_sgneeds = a.fullDepEntry ('' - ensureDir "$out/sgneeds/include/spidermonkey" + mkdir -p "$out/sgneeds/include/spidermonkey" for d in bin include lib; do - ensureDir "$out/sgneeds/$d" - ensureDir "$out/sgneeds/$d" + mkdir -p "$out/sgneeds/$d" + mkdir -p "$out/sgneeds/$d" for p in "${spidermonkey_1_8_0rc1}"; do for f in "$p"/"$d"/*; do ln -sf "$f" "$out"/sgneeds/"$d" @@ -53,7 +53,7 @@ rec { done done - ensureDir "$out/sgneeds/include/sgbrings" + mkdir -p "$out/sgneeds/include/sgbrings" ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js" for f in "$out/sgneeds/lib/"libjs*; do bn="$(basename "$f")" @@ -84,7 +84,7 @@ rec { '' ["minInit"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/bin" "$out/share/veracity/" + mkdir -p "$out/bin" "$out/share/veracity/" cp -r .. "$out/share/veracity/build-dir" ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin" ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin" diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix index a8ced15b58c50..d5e7d1e7c83aa 100644 --- a/pkgs/applications/version-management/viewmtn/0.10.nix +++ b/pkgs/applications/version-management/viewmtn/0.10.nix @@ -26,9 +26,9 @@ rec { fullOut=$(toPythonPath $out) - ensureDir $fullOut - ensureDir $out/bin - ensureDir $out/share/viewmtn + mkdir -p $fullOut + mkdir -p $out/bin + mkdir -p $out/share/viewmtn cp -r * $fullOut cp $fullOut/viewmtn.py $out/bin diff --git a/pkgs/applications/video/RealPlayer/builder.sh b/pkgs/applications/video/RealPlayer/builder.sh index 6a0276d01e4cb..9929634921cb5 100644 --- a/pkgs/applications/video/RealPlayer/builder.sh +++ b/pkgs/applications/video/RealPlayer/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup source $makeWrapper -ensureDir $out/real +mkdir -p $out/real skip=143273 # Look for "BZh91" in the executable. @@ -11,7 +11,7 @@ rm -rf $out/real/Bin $out/real/postinst patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $out/real/realplay.bin -ensureDir $out/bin +mkdir -p $out/bin makeWrapper "$out/real/realplay.bin" "$out/bin/realplay" \ --set HELIX_LIBS "$out/real" \ --suffix-each LD_LIBRARY_PATH ':' "$(addSuffix /lib $libPath)" diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix index 9ef9b67856085..097bf4f49f480 100644 --- a/pkgs/applications/video/dvswitch/default.nix +++ b/pkgs/applications/video/dvswitch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; installPhase = " - ensureDir $out + mkdir -p $out cp src/dv* $out/ "; diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 81b33849887c2..5e6d1d8f942a8 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { # XXX: Tests currently fail. doCheck = false; - preInstall = ''ensureDir $out/plugins''; + preInstall = ''mkdir -p $out/plugins''; postInstall = '' make install-plugins diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 5a2c6287c6f58..9323a1cbd32a6 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/man/man1 $out/bin $out/share $out/etc + mkdir -p $out/man/man1 $out/bin $out/share $out/etc ''; buildInputs = [ libdvdread ]; diff --git a/pkgs/applications/video/mythtv/builder.sh b/pkgs/applications/video/mythtv/builder.sh index c73132b47bcc1..31edf87641bbc 100644 --- a/pkgs/applications/video/mythtv/builder.sh +++ b/pkgs/applications/video/mythtv/builder.sh @@ -17,7 +17,7 @@ buildPhase() { postInstall() { sqlDir="$out/share/mythtv/sql" - ensureDir $sqlDir + mkdir -p $sqlDir cp -p ./database/mc.sql $sqlDir/ } diff --git a/pkgs/applications/virtualization/qemu/linux-img/default.nix b/pkgs/applications/virtualization/qemu/linux-img/default.nix index 23e2ab174771b..58a2b29c2597b 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/default.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/share/qemu-images + mkdir -p $out/share/qemu-images bunzip2 < $src > $out/share/qemu-images/linux-0.2.img ''; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d435f53e10982..e0665909a8d53 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { installPhase = '' # Install VirtualBox files cd out/linux.*/release/bin - ensureDir $out/virtualbox + mkdir -p $out/virtualbox cp -av * $out/virtualbox # Install kernel module @@ -76,7 +76,7 @@ stdenv.mkDerivation { make install # Create wrapper script - ensureDir $out/bin + mkdir -p $out/bin cp -v ${./VBox.sh} $out/bin/VBox.sh sed -i -e "s|@INSTALL_PATH@|$out/virtualbox|" \ -e "s|@QT4_PATH@|${qt4}/lib|" \ @@ -90,7 +90,7 @@ stdenv.mkDerivation { done # Create and fix desktop item - ensureDir $out/share/applications + mkdir -p $out/share/applications sed -i -e "s|Icon=VBox|Icon=$out/virtualbox/VBox.png|" $out/virtualbox/virtualbox.desktop ln -sfv $out/virtualbox/virtualbox.desktop $out/share/applications ''; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 9dfe9c26c0de7..f9adf6132f5da 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ patchelf cdrkit makeWrapper ]; installPhase = '' - ensureDir $out + mkdir -p $out cp -r install/* $out ''; @@ -78,10 +78,10 @@ stdenv.mkDerivation { sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all # Install binaries - ensureDir $out/sbin + mkdir -p $out/sbin install -m 755 sbin/VBoxService $out/sbin - ensureDir $out/bin + mkdir -p $out/bin install -m 755 bin/VBoxClient $out/bin install -m 755 bin/VBoxControl $out/bin install -m 755 bin/VBoxClient-all $out/bin @@ -90,21 +90,21 @@ stdenv.mkDerivation { --prefix PATH : "${which}/bin" # Install OpenGL libraries - ensureDir $out/lib + mkdir -p $out/lib cp -v lib/VBoxOGL*.so $out/lib - ensureDir $out/lib/dri + mkdir -p $out/lib/dri ln -s $out/lib/VBoxOGL.so $out/lib/dri/vboxvideo_dri.so # Install desktop file - ensureDir $out/share/autostart + mkdir -p $out/share/autostart cp -v share/VBoxGuestAdditions/vboxclient.desktop $out/share/autostart # Install HAL FDI file - ensureDir $out/share/hal/fdi/policy + mkdir -p $out/share/hal/fdi/policy install -m 644 share/VBoxGuestAdditions/90-vboxguest.fdi $out/share/hal/fdi/policy # Install Xorg drivers - ensureDir $out/lib/xorg/modules/{drivers,input} + mkdir -p $out/lib/xorg/modules/{drivers,input} install -m 644 lib/VBoxGuestAdditions/vboxvideo_drv_19.so $out/lib/xorg/modules/drivers/vboxvideo_drv.so install -m 644 lib/VBoxGuestAdditions/vboxmouse_drv_19.so $out/lib/xorg/modules/input/vboxmouse_drv.so diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 47ad4ec7aaf0f..db0b6e1037c37 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -23,10 +23,10 @@ rec { ''); installation = fullDepEntry ('' - ensureDir $out/bin - ensureDir $out/share/stumpwm/doc - ensureDir $out/share/info - ensureDir $out/share/stumpwm/lisp + mkdir -p $out/bin + mkdir -p $out/share/stumpwm/doc + mkdir -p $out/share/info + mkdir -p $out/share/stumpwm/lisp cp stumpwm $out/bin cp contrib/stumpish $out/bin || true diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 7329c48f41d3b..3613bb21ff623 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/bin $out/include + mkdir -p $out/bin $out/include ''; buildInputs = [ ncurses pkgconfig glib libviper libpseudo gpm libvterm ]; diff --git a/pkgs/applications/window-managers/wmii31/default.nix b/pkgs/applications/window-managers/wmii31/default.nix index d5705af5ce180..50655a851e2a0 100644 --- a/pkgs/applications/window-managers/wmii31/default.nix +++ b/pkgs/applications/window-managers/wmii31/default.nix @@ -25,7 +25,7 @@ args: with args; stdenv.mkDerivation { set +e make &> /dev/null set -e - ensureDir \$out/bin + mkdir -p \$out/bin cp cmd/wmiimenu \$out/bin "; meta = { homepage = "www.suckless.org"; diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index ba13a0911f7af..50ab7b9a6c1e3 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -320,7 +320,7 @@ let inherit (builtins) head tail trace; in # changing this ? see [1] doForceShare = fullDepEntry (" - ensureDir \"\$prefix/share\" + mkdir -p \"\$prefix/share\" for d in ${toString forceShare}; do if [ -d \"\$prefix/\$d\" -a ! -d \"\$prefix/share/\$d\" ]; then mv -v \"\$prefix/\$d\" \"\$prefix/share\" @@ -332,7 +332,7 @@ let inherit (builtins) head tail trace; in doForceCopy = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" - ensureDir "$prefix/share/$name" + mkdir -p "$prefix/share/$name" for f in ${toString forceCopy}; do cp -r "$f" "$prefix/share/$name/$f" || true done; @@ -393,7 +393,7 @@ let inherit (builtins) head tail trace; in preservePathWrapperArguments = ''''${PATH:+ --prefix PATH : $PATH }''; doPropagate = fullDepEntry (" - ensureDir \$out/nix-support + mkdir -p \$out/nix-support echo '${toString (attrByPath ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs ") ["minInit" "defEnsureDir"]; @@ -410,7 +410,7 @@ let inherit (builtins) head tail trace; in '') ["minInit" "addInputs" "doUnpack"]; doScons = fullDepEntry ('' - ensureDir $out + mkdir -p $out ${if (attrByPath ["sconsCleanEnv"] false args) then "" else '' @@ -462,13 +462,13 @@ let inherit (builtins) head tail trace; in x.text + "\n" + after ;}; createDirs = fullDepEntry (concatStringsSep ";" - (map (x: "ensureDir ${x}") (attrByPath ["neededDirs"] [] args)) + (map (x: "mkdir -p ${x}") (attrByPath ["neededDirs"] [] args)) ) ["minInit" "defEnsureDir"]; copyExtraDoc = fullDepEntry ('' name="$(basename $out)" name="''${name#*-}" - ensureDir "$out/share/doc/$name" + mkdir -p "$out/share/doc/$name" '' + (concatStringsSep ";" (map (x: ''cp "${x}" "$out/share/doc/$name" || true;'') @@ -547,11 +547,11 @@ let inherit (builtins) head tail trace; in installFonts = let retrievedName = (if args ? name then args.name else ""); in fullDepEntry ('' - ensureDir $out/share/fonts/truetype/public/${retrievedName} - ensureDir $out/share/fonts/opentype/public/${retrievedName} - ensureDir $out/share/fonts/type1/public/${retrievedName} - ensureDir $out/share/texmf/fonts/enc/${retrievedName} - ensureDir $out/share/texmf/fonts/map/${retrievedName} + mkdir -p $out/share/fonts/truetype/public/${retrievedName} + mkdir -p $out/share/fonts/opentype/public/${retrievedName} + mkdir -p $out/share/fonts/type1/public/${retrievedName} + mkdir -p $out/share/texmf/fonts/enc/${retrievedName} + mkdir -p $out/share/texmf/fonts/map/${retrievedName} cp *.ttf $out/share/fonts/truetype/public/${retrievedName} || echo No TrueType fonts cp *.otf $out/share/fonts/opentype/public/${retrievedName} || echo No OpenType fonts @@ -561,7 +561,7 @@ let inherit (builtins) head tail trace; in '') ["minInit" "defEnsureDir"]; simplyShare = shareName: fullDepEntry ('' - ensureDir $out/share + mkdir -p $out/share cp -r . $out/share/${shareName} '') ["doUnpack" "defEnsureDir"]; @@ -588,7 +588,7 @@ let inherit (builtins) head tail trace; in '') ["minInit"]; createPythonInstallationTarget = fullDepEntry ('' - ensureDir $(toPythonPath $out) + mkdir -p $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH''${PYTHONPATH:+:}$(toPythonPath $out) '') ["minInit" "addInputs" "defEnsureDir"]; diff --git a/pkgs/build-support/clang-wrapper/builder.sh b/pkgs/build-support/clang-wrapper/builder.sh index fe714a0719a11..9f1542e041135 100644 --- a/pkgs/build-support/clang-wrapper/builder.sh +++ b/pkgs/build-support/clang-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/dotnetenv/build-solution.nix b/pkgs/build-support/dotnetenv/build-solution.nix index 07f1f89c67ce1..b1853bf73641a 100644 --- a/pkgs/build-support/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnetenv/build-solution.nix @@ -71,14 +71,14 @@ stdenv.mkDerivation { export AssemblySearchPaths=$assemblySearchPaths fi - ensureDir $out + mkdir -p $out MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options} # Because .NET assemblies store strings as UTF-16 internally, we cannot detect # hashes. Therefore a text files containing the proper paths is created # We can also use this file the propagate transitive dependencies. - ensureDir $out/nix-support + mkdir -p $out/nix-support for i in ${toString assemblyInputs} do diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh index 3a1df2553e152..6ee594b33b274 100644 --- a/pkgs/build-support/fetchcvs/builder.sh +++ b/pkgs/build-support/fetchcvs/builder.sh @@ -6,7 +6,7 @@ source $stdenv/setup # should work (but didn't - got no response on #cvs) # See als man Page for those options -ensureDir export +mkdir -p export if [ -n "$tag" ]; then tag="-r $tag" else diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index 8bf820e3d3413..ab879c1841fc0 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -20,7 +20,7 @@ let phases = [ "installPhase" ]; installPhase = '' echo $out - ensureDir $out + mkdir -p $out cp -Rd ${gcc}/${cross.config}/lib $out/lib chmod -R +w $out/lib for a in $out/lib/*.la; do diff --git a/pkgs/build-support/gcc-upc-wrapper/builder.sh b/pkgs/build-support/gcc-upc-wrapper/builder.sh index 0c9dccf6edb39..af121afe155a1 100644 --- a/pkgs/build-support/gcc-upc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-upc-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh index 2e87d82f52cd1..ad2b8003f090d 100644 --- a/pkgs/build-support/gcc-wrapper/builder.sh +++ b/pkgs/build-support/gcc-wrapper/builder.sh @@ -1,8 +1,8 @@ source $stdenv/setup -ensureDir $out/bin -ensureDir $out/nix-support +mkdir -p $out/bin +mkdir -p $out/nix-support if test -z "$nativeLibc"; then diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 69931bad113cf..8d334447b6dd8 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -35,7 +35,7 @@ storePaths=$(perl $pathsFromGraph closure-*) # Put the closure in a gzipped cpio archive. -ensureDir $out +mkdir -p $out (cd root && find * -print0 | cpio -ov -H newc --null | gzip -9 > $out/initrd) if [ -n "$makeUInitrd" ]; then diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index faf6e92fdff1b..aa2615eb578dc 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -25,7 +25,7 @@ for module in $rootModules; do done echo "closure:" -ensureDir $out/lib/modules/"$version" +mkdir -p $out/lib/modules/"$version" for module in $closure; do target=$(echo $module | sed "s^$NIX_STORE.*/lib/modules/^$out/lib/modules/^") if test -e "$target"; then continue; fi diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 7f3b97a33b79a..c7f2aea233937 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit name; buildCommand = '' - ensureDir $out/share/applications + mkdir -p $out/share/applications cat > $out/share/applications/$name.desktop <<EOF [Desktop Entry] Type=${type} diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/make-wrapper/make-wrapper.sh index 08146f3789787..41f2a59246d1a 100644 --- a/pkgs/build-support/make-wrapper/make-wrapper.sh +++ b/pkgs/build-support/make-wrapper/make-wrapper.sh @@ -4,7 +4,7 @@ makeWrapper() { local params varName value command separator n fileNames local flagsBefore flags - ensureDir "$(dirname $wrapper)" + mkdir -p "$(dirname $wrapper)" echo "#! $SHELL -e" > $wrapper diff --git a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh index c79b3709ee8b4..2e2e125c6495e 100644 --- a/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh +++ b/pkgs/build-support/native-darwin-cctools-wrapper/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin for i in ar as c++filt gprof ld nm nmedit ranlib size strings strip dsymutil libtool; do ln -s /usr/bin/$i $out/bin/ done diff --git a/pkgs/build-support/nuke-references/builder.sh b/pkgs/build-support/nuke-references/builder.sh index 3b9324073ef88..9e8c464d8288c 100644 --- a/pkgs/build-support/nuke-references/builder.sh +++ b/pkgs/build-support/nuke-references/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/nuke-refs <<EOF #! $SHELL -e for i in \$*; do diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 2aa08ee27dec0..fe15f93a8fe29 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation ( ''; installPhase = '' - ensureDir $out/lib/java + mkdir -p $out/lib/java ${ if jars == [] then '' find . -name "*.jar" | xargs -I{} cp -v {} $out/lib/java '' else stdenv.lib.concatMapStrings (j: '' @@ -58,7 +58,7 @@ stdenv.mkDerivation ( header "Generating jar wrappers" '' + (stdenv.lib.concatMapStrings (w: '' - ensureDir $out/bin + mkdir -p $out/bin cat >> $out/bin/${w.name} <<EOF #! /bin/sh export JAVA_HOME=$jre @@ -98,7 +98,7 @@ stdenv.mkDerivation ( buildInputs = [ant jre] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ; postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system # If `src' is the result of a call to `makeSourceTarball', then it diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index f8bb5282ee2f1..6901c9f5555f4 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system # If `src' is the result of a call to `makeSourceTarball', then it @@ -62,7 +62,7 @@ stdenv.mkDerivation ( distPhase = '' - ensureDir $out/tarballs + mkdir -p $out/tarballs tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . ''; diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 070a54fc945cc..8d2ea849a09f8 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -30,7 +30,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( # !!! cut&paste from rpm-build.nix postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name # If `src' is the result of a call to `makeSourceTarball', then it @@ -67,7 +67,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( --provides="${concatStringsSep "," debProvides}" \ make install - ensureDir $out/debs + mkdir -p $out/debs find . -name "*.deb" -exec cp {} $out/debs \; [ "$(echo $out/debs/*.deb)" != "" ] diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 66dd10005f20e..39f069cd57f05 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation ( rec { setupPhase = '' runHook preSetupPhase - ensureDir $out/nix-support + mkdir -p $out/nix-support export LANG="en_US.UTF-8" export LOCALE_ARCHIVE=$glibcLocales/lib/locale/locale-archive export M2_REPO=$TMPDIR/repository @@ -74,7 +74,7 @@ stdenv.mkDerivation ( rec { ''; mvnRelease = '' - ensureDir $out/release + mkdir -p $out/release zip=$(ls target/*.zip| head -1) releaseName=$(basename $zip .zip) diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix index a32f0e07a0cc3..64d8b8f192478 100644 --- a/pkgs/build-support/release/nix-build.nix +++ b/pkgs/build-support/release/nix-build.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation ( if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" header "Copying build directory to $KEEPBUILDDIR" - ensureDir $KEEPBUILDDIR + mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR stopNest fi @@ -56,7 +56,7 @@ stdenv.mkDerivation ( name = name + (if src ? version then "-" + src.version else ""); postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system if test -z "${toString doCoverageAnalysis}"; then diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 326ccbe9c4284..26b120e5b1d06 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -14,7 +14,7 @@ vmTools.buildRPM ( name = name + "-" + diskImage.name + (if src ? version then "-" + src.version else ""); preBuild = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat "$diskImage"/nix-support/full-name > $out/nix-support/full-name # If `src' is the result of a call to `makeSourceTarball', then it diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix index 16ac0033d93bd..af8b9d3c789d1 100644 --- a/pkgs/build-support/release/source-tarball.nix +++ b/pkgs/build-support/release/source-tarball.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation ( if test -n "$keepBuildDirectory"; then KEEPBUILDDIR="$out/`basename $TMPDIR`" header "Copying build directory to $KEEPBUILDDIR" - ensureDir $KEEPBUILDDIR + mkdir -p $KEEPBUILDDIR cp -R $TMPDIR/* $KEEPBUILDDIR stopNest fi @@ -91,7 +91,7 @@ stdenv.mkDerivation ( buildInputs = buildInputs ++ bootstrapBuildInputs; postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support ''; postUnpack = '' diff --git a/pkgs/build-support/substitute/substitute-all.sh b/pkgs/build-support/substitute/substitute-all.sh index 796a1a471529f..ec220481fcc09 100644 --- a/pkgs/build-support/substitute/substitute-all.sh +++ b/pkgs/build-support/substitute/substitute-all.sh @@ -7,7 +7,7 @@ args= target=$out if test -n "$dir"; then target=$out/$dir/$name - ensureDir $out/$dir + mkdir -p $out/$dir fi substituteAll $src $target diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 5defdb55b9595..1815c99a9f4b7 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -48,7 +48,7 @@ rec { makeSetupHook = { deps ? [], substitutions ? {} }: script: runCommand "hook" substitutions ('' - ensureDir $out/nix-support + mkdir -p $out/nix-support cp ${script} $out/nix-support/setup-hook '' + stdenv.lib.optionalString (deps != []) '' echo ${toString deps} > $out/nix-support/propagated-build-native-inputs diff --git a/pkgs/build-support/upstream-updater/attrset-to-dir.nix b/pkgs/build-support/upstream-updater/attrset-to-dir.nix index a05f80da085a8..bdf44b7a5bf30 100644 --- a/pkgs/build-support/upstream-updater/attrset-to-dir.nix +++ b/pkgs/build-support/upstream-updater/attrset-to-dir.nix @@ -1,7 +1,7 @@ a : a.stdenv.mkDerivation rec { buildCommand = '' - ensureDir "$out/attributes" + mkdir -p "$out/attributes" '' + (a.lib.concatStrings (map (n: '' diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 207edce147b1d..63fc994af37ab 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -29,8 +29,8 @@ rec { allowedReferences = [ "out" modulesClosure ]; # prevent accidents like glibc being included in the initrd } '' - ensureDir $out/bin - ensureDir $out/lib + mkdir -p $out/bin + mkdir -p $out/lib # Copy what we need from Glibc. cp -p ${glibc}/lib/ld-linux*.so.? $out/lib @@ -364,8 +364,8 @@ rec { ${module_init_tools}/sbin/modprobe cramfs mknod /dev/loop0 b 7 0 - ensureDir $out - ensureDir tmp + mkdir -p $out + mkdir -p tmp mount -o loop,ro,ufstype=44bsd ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp || mount -o loop,ro ${lib.optionalString (fs != null) "-t ${fs} "}${file} tmp cp -Rv tmp/* $out/ || exit 0 @@ -388,8 +388,8 @@ rec { mknod /dev/mtd0 c 90 0 mknod /dev/mtdblock0 b 31 0 - ensureDir $out - ensureDir tmp + mkdir -p $out + mkdir -p tmp dd if=${file} of=/dev/mtd0 mount ${lib.optionalString (fs != null) "-t ${fs} "}/dev/mtdblock0 tmp @@ -610,7 +610,7 @@ rec { installPhase = '' eval "$preInstall" - ensureDir $out/$outDir + mkdir -p $out/$outDir find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \; for i in $out/$outDir/*.rpm; do diff --git a/pkgs/build-support/vsenv/build-solution.nix b/pkgs/build-support/vsenv/build-solution.nix index 7d7d6a86e1f35..32dd06abfaf39 100644 --- a/pkgs/build-support/vsenv/build-solution.nix +++ b/pkgs/build-support/vsenv/build-solution.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { installPhase = '' cd ${baseDir} vcbuild.exe /rebuild ${slnFile} - ensureDir $out + mkdir -p $out cp Debug/* $out ''; buildInputs = [ vs ] ++ extraBuildInputs; diff --git a/pkgs/data/documentation/pthread-man-pages/default.nix b/pkgs/data/documentation/pthread-man-pages/default.nix index a19c8bf8e9a38..296ba982b8a46 100644 --- a/pkgs/data/documentation/pthread-man-pages/default.nix +++ b/pkgs/data/documentation/pthread-man-pages/default.nix @@ -27,7 +27,7 @@ in ''; patchPhase = '' - ensureDir "$out/share/man/man3" + mkdir -p "$out/share/man/man3" sed -i "linuxthreads/man/Makefile" \ -e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ; diff --git a/pkgs/data/documentation/rnrs/builder.sh b/pkgs/data/documentation/rnrs/builder.sh index 096dd2a8ca75f..6ec5c855ababe 100644 --- a/pkgs/data/documentation/rnrs/builder.sh +++ b/pkgs/data/documentation/rnrs/builder.sh @@ -4,9 +4,9 @@ source "$stdenv/setup" || exit 1 echo "source is \`$src', report name is \`$reportName'" -ensureDir "$out/share/info" && \ +mkdir -p "$out/share/info" && \ makeinfo -o "$out/share/info/${reportName}.info" "$src" # XXX: HTML output is apparently broken. -#ensureDir "$out/share/doc/${reportName}" && \ +#mkdir -p "$out/share/doc/${reportName}" && \ #makeinfo -o "$out/share/doc/${reportName}/html" --html --force "$src" diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index 221f76c36fa76..3b45da914d25a 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/share/man + mkdir -p $out/share/man cp -R * $out/share/man ''; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 8c2803c26d70b..742f0bd0b4aaf 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 c7f1ad38f47c7..5f9cbec7a97ae 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 32050ac5c28f9..2761ed6f3e691 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 75896e059bf49..b26d3bd8c1d6f 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 fb952f39604e3..505746b3edfce 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 927cc48575d08..0d6750614d478 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 e1427a79f0d52..0ff2ec7ba1660 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 eb7547e628f7d..1690f82aa37d0 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 a5dc014d8b4a5..831a3ddbd09cc 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 ceca85a0d2313..7fe56987ad365 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 cb1225763fd0c..c331b85029d93 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 57f463ba64c7a..64b18ffdaaab6 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 76d2f3b28c1a1..79d1a0909058c 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 73dcf368d72a7..19996f3f1a310 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 ba38d8dc1abbb..698ecc5304626 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 ''; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 6156cf17f1698..4db1e84b48530 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/etc + mkdir -p $out/etc bunzip2 < $src > $out/etc/ca-bundle.crt ''; diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh index e0cdb22e23c39..96ad77eaa57c7 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh @@ -4,14 +4,14 @@ unpackFile $src cd docbook-* -ensureDir $out/xml/rng +mkdir -p $out/xml/rng cp -prv rng $out/xml/rng/docbook -ensureDir $out/xml/dtd +mkdir -p $out/xml/dtd cp -prv dtd $out/xml/dtd/docbook -ensureDir $out/share/doc +mkdir -p $out/share/doc cp -prv docs $out/share/doc/docbook -ensureDir $out/share/docbook +mkdir -p $out/share/docbook cp -prv tools $out/share/docbook/ diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix index cdcf62467dba9..8e626e3bc5243 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/xml/dtd/xhtml1 + mkdir -p $out/xml/dtd/xhtml1 cp DTD/*.ent DTD/*.dtd $out/xml/dtd/xhtml1 # Generate an XML catalog. diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix index 978bbcbd5a7fa..c143ce1669833 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/xml/xsl + mkdir -p $out/xml/xsl cd .. mv docbook-xsl-ns-* $out/xml/xsl/docbook ''; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh index 1534806895cd6..9ac8e74d93a36 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out cd $out unpackFile $src mkdir xml diff --git a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix index 90a9088d45626..c5086accc0db8 100644 --- a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { # maybe there is a better way to pass the needed dtd and xsl files # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" preConfigure = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cat > $out/nix-support/catalog.xml << EOF <?xml version="1.0"?> <!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> diff --git a/pkgs/development/compilers/abc/builder-binjar.sh b/pkgs/development/compilers/abc/builder-binjar.sh index 9faa0541c6c32..a954c49aa3f63 100644 --- a/pkgs/development/compilers/abc/builder-binjar.sh +++ b/pkgs/development/compilers/abc/builder-binjar.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars cp $src $out/jars/$jarname.jar diff --git a/pkgs/development/compilers/abc/builder.sh b/pkgs/development/compilers/abc/builder.sh index 36d2e4e68e1ce..ba59402384267 100644 --- a/pkgs/development/compilers/abc/builder.sh +++ b/pkgs/development/compilers/abc/builder.sh @@ -23,7 +23,7 @@ EOF $apacheAnt/bin/ant jars -ensureDir $out/jars +mkdir -p $out/jars cp lib/abc.jar $out/jars cp lib/abc-runtime.jar $out/jars @@ -31,7 +31,7 @@ cp lib/abc-testing.jar $out/jars cp lib/abc-complete.jar $out/jars # Create the executable abc script -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/abc <<EOF #! $SHELL -e diff --git a/pkgs/development/compilers/abc/jasmin/builder.sh b/pkgs/development/compilers/abc/jasmin/builder.sh index c30f86fb7f5e1..81b150b952785 100644 --- a/pkgs/development/compilers/abc/jasmin/builder.sh +++ b/pkgs/development/compilers/abc/jasmin/builder.sh @@ -20,5 +20,5 @@ EOF ant jasmin-jar -ensureDir $out/jars/ +mkdir -p $out/jars/ mv lib/jasminclasses-foo.jar $out/jars/jasmin.jar diff --git a/pkgs/development/compilers/abc/polyglot/builder.sh b/pkgs/development/compilers/abc/polyglot/builder.sh index 81acfde1d4f7e..babae49ae557f 100644 --- a/pkgs/development/compilers/abc/polyglot/builder.sh +++ b/pkgs/development/compilers/abc/polyglot/builder.sh @@ -6,6 +6,6 @@ cd polyglot-* ant polyglot-jar ant cup -ensureDir $out/jars/ +mkdir -p $out/jars/ mv lib/java_cup.jar $out/jars/ mv lib/polyglot*.jar $out/jars/ diff --git a/pkgs/development/compilers/abc/soot/builder.sh b/pkgs/development/compilers/abc/soot/builder.sh index 18718943077fe..adc27161e4e28 100644 --- a/pkgs/development/compilers/abc/soot/builder.sh +++ b/pkgs/development/compilers/abc/soot/builder.sh @@ -15,5 +15,5 @@ EOF ant classesjar -ensureDir $out/jars/ +mkdir -p $out/jars/ mv lib/sootclasses-foo.jar $out/jars/soot.jar diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix index 190da87227846..fc4511d896e27 100644 --- a/pkgs/development/compilers/adobe-flex-sdk/default.nix +++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installPhase = '' unzip ${src} t=$out/opt/flex-sdk - ensureDir $t $out/bin + mkdir -p $t $out/bin mv * $t rm $t/bin/*.exe $t/bin/*.bat sed 's/ $//' -i $t/bin/* diff --git a/pkgs/development/compilers/aspectj/builder.sh b/pkgs/development/compilers/aspectj/builder.sh index 7b82f7f2a9ecb..3b43937200423 100755 --- a/pkgs/development/compilers/aspectj/builder.sh +++ b/pkgs/development/compilers/aspectj/builder.sh @@ -7,7 +7,7 @@ output.dir=$out context.javaPath=$jre EOF -ensureDir $out +mkdir -p $out $jre/bin/java -jar $src -text props echo "Removing files at top level" diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index 404c0fce52325..54628fa509d90 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -21,10 +21,10 @@ rec { phaseNames = ["doUnpack" "doPatchElf" "doCopy"]; doCopy = a.fullDepEntry '' - ensureDir "$out/share" + mkdir -p "$out/share" cp -r . "$out/share/ccl-installation" - ensureDir "$out/bin" + mkdir -p "$out/bin" for i in $(find . -maxdepth 1 -type f -perm +111); do echo -e '#! /bin/sh\n'"$out/share/ccl-installation/$(basename "$i")"'"$@"\n' > "$out"/bin/"$(basename "$i")" chmod a+x "$out"/bin/"$(basename "$i")" diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 1e5c7d4febc82..11d0b723ce459 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { name = "cmucl-binary-${version}"; buildCommand = '' - ensureDir $out + mkdir -p $out tar -C $out -xjf ${dist} patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ $out/bin/lisp diff --git a/pkgs/development/compilers/eql/default.nix b/pkgs/development/compilers/eql/default.nix index 70d309472243d..4e288824713d7 100644 --- a/pkgs/development/compilers/eql/default.nix +++ b/pkgs/development/compilers/eql/default.nix @@ -64,7 +64,7 @@ rec { doDeploy = a.fullDepEntry ('' cd .. - ensureDir $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib + mkdir -p $out/bin $out/lib/eql/ $out/include $out/include/gen $out/lib cp -r . $out/lib/eql/build-dir ln -s $out/lib/eql/build-dir/eql $out/bin ln -s $out/lib/eql/build-dir/src/*.h $out/include diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index d8830c4e24969..1cb4e479e37cf 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -23,7 +23,7 @@ rec { preBuild = fullDepEntry ('' export NIX_LDFLAGS='-lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo' export LCL_PLATFORM=gtk2 - ensureDir $out/share + mkdir -p $out/share tar xf ${fpc.src} --strip-components=1 -C $out/share -m sed -e 's@/usr/fpcsrc@'"$out/share/fpcsrc@" -i ide/include/unix/lazbaseconf.inc '') diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index bda8372e6c46f..616c9de7edeb6 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -70,11 +70,11 @@ stdenv.mkDerivation rec { postInstall = (if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A + mkdir -p $out/frameworks/GMP.framework/Versions/A ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP # !!! fix this - ensureDir $out/frameworks/GNUeditline.framework/Versions/A + mkdir -p $out/frameworks/GNUeditline.framework/Versions/A ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/Versions/A/GNUeditline diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix index 6394780eb68ca..a84b75d705b1b 100644 --- a/pkgs/development/compilers/ghc/6.12.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { postInstall = (if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A + mkdir -p $out/frameworks/GMP.framework/Versions/A ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP # !!! fix this diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix index 63cc08db34b12..2ed6f2be4fe46 100644 --- a/pkgs/development/compilers/ghc/6.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix @@ -49,10 +49,10 @@ stdenv.mkDerivation { # that the executables work with no special setup. postInstall = if stdenv.isDarwin then '' - ensureDir $out/frameworks/GMP.framework/Versions/A + mkdir -p $out/frameworks/GMP.framework/Versions/A ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP - ensureDir $out/frameworks/GNUreadline.framework/Versions/A + mkdir -p $out/frameworks/GNUreadline.framework/Versions/A ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/GNUreadline ln -s ${readline}/lib/libreadline.dylib $out/frameworks/GNUreadline.framework/Versions/A/GNUreadline diff --git a/pkgs/development/compilers/ghc/6.6.1.nix b/pkgs/development/compilers/ghc/6.6.1.nix index c54c32bfab0cc..994ebc286c30e 100644 --- a/pkgs/development/compilers/ghc/6.6.1.nix +++ b/pkgs/development/compilers/ghc/6.6.1.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { }; postInstall = '' - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "# Path to the GHC compiler directory in the store" > $out/nix-support/setup-hook echo "ghc=$out" >> $out/nix-support/setup-hook echo "" >> $out/nix-support/setup-hook diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix index 19ce4eabf423e..63427ea82782a 100644 --- a/pkgs/development/compilers/ghc/with-packages.nix +++ b/pkgs/development/compilers/ghc/with-packages.nix @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { linkedTopDir="$out/lib" linkedPkgDir="$linkedTopDir/package.conf.d" - ensureDir $out/bin - ensureDir $linkedTopDir - ensureDir $linkedPkgDir + mkdir -p $out/bin + mkdir -p $linkedTopDir + mkdir -p $linkedPkgDir echo "Linking GHC core libraries:" diff --git a/pkgs/development/compilers/ghc/wrapper.nix b/pkgs/development/compilers/ghc/wrapper.nix index 60342a14a61fc..b04cd18fb46cb 100644 --- a/pkgs/development/compilers/ghc/wrapper.nix +++ b/pkgs/development/compilers/ghc/wrapper.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp $GHCGetPackages $out/bin/ghc-get-packages.sh chmod 755 $out/bin/ghc-get-packages.sh for prg in ghc ghci ghc-${ghc.version} ghci-${ghc.version}; do @@ -41,7 +41,7 @@ stdenv.mkDerivation { done EOF chmod +x $out/bin/ghc-packages - ensureDir $out/nix-support + mkdir -p $out/nix-support ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages ''; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 954fb6bf594fd..79208743ae42a 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { dontStrip=1; installPhase = '' - ensureDir $out + mkdir -p $out cp -R * $out set +e for a in $out/bin/* ; do diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index 3f2c327482215..143c091a1dc07 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { else throw "Unsupported system"; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" export GOROOT="$(pwd)/" export GOBIN="$out/bin" export PATH="$GOBIN:$PATH" @@ -57,7 +57,7 @@ stdenv.mkDerivation { # Handle Libraries and make them availabale under /share/go. export GOLIB="pkg/"$GOOS"_"$GOARCH - ensureDir "$out/lib/go/$GOLIB" + mkdir -p "$out/lib/go/$GOLIB" cp -r ./$GOLIB $out/lib/go/pkg/ # this line set $AS $CC $GC $LD @@ -75,7 +75,7 @@ stdenv.mkDerivation { --set "GOARCH" "$GOARCH" # Copy the emacs configuration for Go files. - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp ./misc/emacs/* $out/share/emacs/site-lisp/ # */ ''; diff --git a/pkgs/development/compilers/gwt/builder.sh b/pkgs/development/compilers/gwt/builder.sh index d260bd559dc77..b14a0432ea58f 100644 --- a/pkgs/development/compilers/gwt/builder.sh +++ b/pkgs/development/compilers/gwt/builder.sh @@ -1,14 +1,14 @@ source $stdenv/setup tar xfvj $src -ensureDir $out +mkdir -p $out cp -av $name $out # Create wrapper scripts so that the GWT compiler/host work libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12" -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/gwt-compile <<EOF #!/bin/sh diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 33260cd5469ae..8018b478e809d 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -79,7 +79,7 @@ let # probably rpath should be set properly installPhase = '' - ensureDir $out/lib/haxe + mkdir -p $out/lib/haxe cp -r bin $out/bin wrapProgram "$out/bin/haxe" \ --set "LD_LIBRARY_PATH" $zlib/lib \ @@ -107,7 +107,7 @@ let buildPhase = '' cd std/tools/${name}; haxe *.hxml - ensureDir $out/bin + mkdir -p $out/bin mv ${name} $out/bin/ ''; diff --git a/pkgs/development/compilers/jdk/builder.sh b/pkgs/development/compilers/jdk/builder.sh index 7f402dab1588c..ccfe2838d1b65 100644 --- a/pkgs/development/compilers/jdk/builder.sh +++ b/pkgs/development/compilers/jdk/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup unzip $src || true -ensureDir $out +mkdir -p $out mv $dirname/* $out/ # Remove crap in the root directory. diff --git a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh index ee58ce9127ca2..f0d36347ab0b4 100644 --- a/pkgs/development/compilers/jdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/jdk/dlj-bundle-builder.sh @@ -10,7 +10,7 @@ patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath echo "constructing JDK and JRE installations" if test -z "$installjdk"; then sh ${construct} . tmp-linux-jdk tmp-linux-jre - ensureDir $out + mkdir -p $out cp -R tmp-linux-jre/* $out else sh ${construct} . $out tmp-linux-jre diff --git a/pkgs/development/compilers/jdk/ibm-builder.sh b/pkgs/development/compilers/jdk/ibm-builder.sh index b78dac6163be1..2ff3a71322a62 100644 --- a/pkgs/development/compilers/jdk/ibm-builder.sh +++ b/pkgs/development/compilers/jdk/ibm-builder.sh @@ -17,7 +17,7 @@ fi tar zxf $pathname || true -ensureDir $out +mkdir -p $out mv $dirname/* $out/ # Remove crap in the root directory. diff --git a/pkgs/development/compilers/llvm/dragonegg.nix b/pkgs/development/compilers/llvm/dragonegg.nix index 70098a19a066e..fbaa80c115dfb 100644 --- a/pkgs/development/compilers/llvm/dragonegg.nix +++ b/pkgs/development/compilers/llvm/dragonegg.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ llvm gmp mpfr mpc ]; installPhase = '' - ensureDir $out/lib $out/share/doc/${name} + mkdir -p $out/lib $out/share/doc/${name} cp -d dragonegg.so $out/lib cp README COPYING $out/share/doc/${name} ''; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 060d59476cf2d..28a98fe1e258b 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -31,7 +31,7 @@ composableDerivation.composableDerivation {} ( fixed : { src/tools/install.neko sed -i "s@/usr/local@$out@" Makefile vm/load.c # make sure that nekotools boot finds the neko executable and not our wrapper: - ensureDir $out/{bin,lib} + mkdir -p $out/{bin,lib} sed -i "s@\"neko\"@\".neko-wrapped\"@" src/tools/nekoboot.neko ln -s ./neko bin/.neko-wrapped diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index 8bb201f975e73..c2700b01ffa43 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -28,19 +28,19 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-*.so.? "bin/$b" done # FIXME: cgfxcat and cginfo need more patchelf - ensureDir "$out/bin/" + mkdir -p "$out/bin/" cp -v bin/* "$out/bin/" - ensureDir "$out/include/" + mkdir -p "$out/include/" cp -v -r include/Cg/ "$out/include/" - ensureDir "$out/lib/" + mkdir -p "$out/lib/" [ "$system" = "x86_64-linux" ] && cp -v lib64/* "$out/lib/" [ "$system" = "i686-linux" ] && cp -v lib/* "$out/lib/" for mandir in man1 man3 manCg manCgFX do - ensureDir "$out/share/man/$mandir/" + mkdir -p "$out/share/man/$mandir/" cp -v share/man/$mandir/* "$out/share/man/$mandir/" done - ensureDir "$out/share/doc/$name/" + mkdir -p "$out/share/doc/$name/" cp -v -r local/Cg/* "$out/share/doc/$name/" ''; diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index fdd95db544062..281aa1a9de6f1 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang ''; postBuild = '' - ensureDir $out/include + mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml ''; diff --git a/pkgs/development/compilers/ocaml/3.11.1.nix b/pkgs/development/compilers/ocaml/3.11.1.nix index 0add40dcd68fe..f7db9231bd42b 100644 --- a/pkgs/development/compilers/ocaml/3.11.1.nix +++ b/pkgs/development/compilers/ocaml/3.11.1.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { patch -p0 < ${./mips64.patch} ''; postBuild = '' - ensureDir $out/include + mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml ''; diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index eaf1f55e281bc..155523ebe5600 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang ''; postBuild = '' - ensureDir $out/include + mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml ''; diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 5b3052b544ab4..df3e9e73af59d 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { cd .. ''; postBuild = '' - ensureDir $out/include + mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml ''; postInstall = '' diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index b115a8fedcfb4..4313dcd7537e5 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang ''; postBuild = '' - ensureDir $out/include + mkdir -p $out/include ln -sv $out/lib/ocaml/caml $out/include/caml ''; diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 6df16e44c3d44..2a54b90dda982 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { done # Install emacs mode. - ensureDir $out/share/emacs/site-lisp/opa + mkdir -p $out/share/emacs/site-lisp/opa install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa ''; diff --git a/pkgs/development/compilers/openjdk-darwin/default.nix b/pkgs/development/compilers/openjdk-darwin/default.nix index 88099a90949cc..cbd41033bfca6 100644 --- a/pkgs/development/compilers/openjdk-darwin/default.nix +++ b/pkgs/development/compilers/openjdk-darwin/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out + mkdir -p $out cp -vR * $out/ ''; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 0ea08071aaa0c..cf85c1706a8a6 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ]; postUnpack = '' - ensureDir drops + mkdir -p drops cp ${jaxp_src} drops/${jaxp_src_name} cp ${jaxws_src} drops/${jaxws_src_name} cp ${jaf_src} drops/${jaf_src_name} @@ -114,14 +114,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out ''; # '' + (if jreOnly then "" else '' # if [ -z $jre ]; then # exit 0 # fi -# ensureDir $jre +# mkdir -p $jre # cp -av build/*/j2re-image/* $jre # ''); diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 3c4723a88fb1a..6bec1925f0b89 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { # The Prolog sources must be built in their final directory. (cd $out/curry2prolog/ ; make) - ensureDir $out/share/emacs/site-lisp/curry-pakcs + mkdir -p $out/share/emacs/site-lisp/curry-pakcs for e in "$out/tools/emacs/"*.el ; do ln -s $out/tools/emacs/$e $out/share/emacs/site-lisp/curry-pakcs/; done diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index f1f34f87d6920..ae01725585493 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -16,8 +16,8 @@ let allBuild = fullDepEntry (" (sleep 0.1; echo ) | clisp install.txt; (sleep 0.1; echo -e '1\n(quit)\n' ) | sh Qi-Linux-CLisp - ensureDir \$out/share - ensureDir \$out/bin + mkdir -p \$out/share + mkdir -p \$out/bin cp -r . \$out/share/Qi-9.1 echo -e '#! ${shell} arg1=\${1:-'\$out'/share/Qi-9.1/startup.txt} diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 9ce9eaebc1237..f50c15a3a0b81 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out + mkdir -p $out rm bin/*.bat mv * $out ''; diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index acae45626a09a..a45217a331adf 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation rec { buildPhase = '' ./build ''; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp stalin "$out/bin" - ensureDir "$out/man/man1" + mkdir -p "$out/man/man1" cp stalin.1 "$out/man/man1" - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp stalin.el "$out/share/emacs/site-lisp" - ensureDir "$out/doc/${name}" + mkdir -p "$out/doc/${name}" cp README "$out/doc/${name}" - ensureDir "$out/share/${name}/include" + mkdir -p "$out/share/${name}/include" cp "include/"* "$out/share/${name}/include" substituteInPlace "$out/bin/stalin" \ diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 7ece90e8601f6..058d84a12de8d 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -50,7 +50,7 @@ let version = "0.9.25"; in postInstall = '' makeinfo --force tcc-doc.texi || true - ensureDir "$out/share/info" + mkdir -p "$out/share/info" mv tcc-doc.info* "$out/share/info" echo 'int main () { printf ("it works!\n"); exit(0); }' | \ diff --git a/pkgs/development/compilers/visual-c++/builder.sh b/pkgs/development/compilers/visual-c++/builder.sh index 137db50fb6298..5469f3760ca04 100644 --- a/pkgs/development/compilers/visual-c++/builder.sh +++ b/pkgs/development/compilers/visual-c++/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out cabextract $src @@ -12,7 +12,7 @@ rm ../vc* # reduce temporary disk usage a bit while read target; do read source echo "$source -> $target" - ensureDir $out/$(dirname $target) + mkdir -p $out/$(dirname $target) cp -p "$source" $out/"$target" done < $filemap diff --git a/pkgs/development/compilers/visual-c++/test/builder.sh b/pkgs/development/compilers/visual-c++/test/builder.sh index 8adb7e466ee03..c11ffc574a86e 100644 --- a/pkgs/development/compilers/visual-c++/test/builder.sh +++ b/pkgs/development/compilers/visual-c++/test/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup source $visualcpp/setup source $windowssdk/setup -ensureDir $out/bin +mkdir -p $out/bin cl "$(cygpath -w $src)" /Fe"$(cygpath -w $out/bin/hello.exe)" user32.lib diff --git a/pkgs/development/compilers/vs90wrapper/default.nix b/pkgs/development/compilers/vs90wrapper/default.nix index 47d7c2654a181..341833fdf4724 100644 --- a/pkgs/development/compilers/vs90wrapper/default.nix +++ b/pkgs/development/compilers/vs90wrapper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "visual-studio-9.0"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s "/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/vcpackages/vcbuild.exe" $out/bin/vcbuild.exe ''; } diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 6cad083ac8539..6d074ac9f279e 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -28,7 +28,7 @@ rec { cd $out/share/${installSuffix} make LISP=${a.sbcl}/bin/sbcl make LISP=${a.sbcl}/bin/sbcl regression - ensureDir "$out/bin" + mkdir -p "$out/bin" cp saved_acl2 "$out/bin/acl2" '') ["doDeploy" "addInputs" "defEnsureDir"]; diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix index 65ff72bae56f8..24edb2ec4df50 100644 --- a/pkgs/development/interpreters/angelscript/default.nix +++ b/pkgs/development/interpreters/angelscript/default.nix @@ -32,7 +32,7 @@ rec { prepareBuild = a.fullDepEntry '' cd angelscript/projects/gnuc sed -i makefile -e "s@LOCAL = .*@LOCAL = $out@" - ensureDir "$out/lib" "$out/bin" "$out/share" "$out/include" + mkdir -p "$out/lib" "$out/bin" "$out/share" "$out/include" export SHARED=1 export VERSION="${version}" '' ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; @@ -42,7 +42,7 @@ rec { '' ["minInit"]; installDocs = a.fullDepEntry '' - ensureDir "$out/share/angelscript" + mkdir -p "$out/share/angelscript" cp -r ../../../docs "$out/share/angelscript" '' ["defEnsureDir" "prepareBuild"]; diff --git a/pkgs/development/interpreters/clojure/binary.nix b/pkgs/development/interpreters/clojure/binary.nix index 7b53ea9022d68..8cf350e7e972a 100644 --- a/pkgs/development/interpreters/clojure/binary.nix +++ b/pkgs/development/interpreters/clojure/binary.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; installPhase = " - ensureDir $out/lib/java + mkdir -p $out/lib/java install -t $out/lib/java clojure.jar "; diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 23bf9ad03b783..2ad6f751f2bdd 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { phases = "installPhase"; installPhase = '' - ensureDir $out/lib/java + mkdir -p $out/lib/java ln -s ${jar} $out/lib/java/clooj.jar ''; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index f829beda7bab5..f68b89f039803 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildPhase = "ant"; installPhase = " - ensureDir $out/lib/java + mkdir -p $out/lib/java install -t $out/lib/java clojure.jar "; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index cc994aeea34b5..593cc61dc4107 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out + mkdir -p $out rm bin/*.bat mv * $out ''; diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 3be0e8aa1174d..d4a1ab85b1397 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -53,11 +53,11 @@ rec { '' ["doUnpack" "addInputs" "minInit"]; doDeploy = a.fullDepEntry '' - ensureDir "$out" + mkdir -p "$out" cp -r j/bin "$out/bin" rm "$out/bin/profilex_template.ijs" - ensureDir "$out/share/j" + mkdir -p "$out/share/j" cp -r docs j/addons j/system "$out/share/j" '' ["doUnpack" "doBuildJ" "minInit" "defEnsureDir"]; diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index d26ab69493441..1e402e14e7da8 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1q3cjshxk484i8gqxm682bxcrps7205nl9vlim4s6z827bjlmc4a"; }; - installPhase = '' ensureDir $out; cp -r * $out ''; + installPhase = '' mkdir -p $out; cp -r * $out ''; meta = { description = "Ruby interpreter written in Java"; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 2e433e11033f1..7e4f1e408b44a 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -29,7 +29,7 @@ rec { makeFlags = ["PREFIX=\$out"]; prepareOut = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" '' ["minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/development/interpreters/lua-5/default.nix b/pkgs/development/interpreters/lua-5/default.nix index 06703e12210d9..c11a9d10d7b39 100644 --- a/pkgs/development/interpreters/lua-5/default.nix +++ b/pkgs/development/interpreters/lua-5/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { postInstall = '' sed -i -e "s@/usr/local@$out@" etc/lua.pc sed -i -e "s@-llua -lm@-llua -lm -ldl@" etc/lua.pc - ensureDir "$out/lib/pkgconfig" + mkdir -p "$out/lib/pkgconfig" install -m 644 etc/lua.pc $out/lib/pkgconfig/lua.pc ''; buildInputs = [ ncurses readline ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index f5d4fd0901594..de1a14b522b24 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postInstall = '' for n in "$out/bin/"*; do wrapProgram "$n" --suffix MAUDE_LIB ':' "$out/share/maude"; done - ensureDir $out/share/maude + mkdir -p $out/share/maude cp ${fullMaude} $out/share/maude/full-maude.maude ''; diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix index 4b965999910c6..c421e2768cdc8 100644 --- a/pkgs/development/interpreters/perl/5.8/default.nix +++ b/pkgs/development/interpreters/perl/5.8/default.nix @@ -25,7 +25,7 @@ preBuild() { } postInstall() { - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" cp $setupHook $out/nix-support/setup-hook } diff --git a/pkgs/development/interpreters/php-xdebug/default.nix b/pkgs/development/interpreters/php-xdebug/default.nix index 74aba643ee7d1..5a242f3c85a41 100644 --- a/pkgs/development/interpreters/php-xdebug/default.nix +++ b/pkgs/development/interpreters/php-xdebug/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/lib/xdebug + mkdir -p $out/lib/xdebug cp modules/xdebug.so $out/lib cp LICENSE $out/lib/xdebug ''; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 298c12d271a40..196e7068e146d 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -41,7 +41,7 @@ rec { sed -e "s@/usr/@$out/@g" -i bin/pil - ensureDir "$out/share/picolisp" "$out/lib" "$out/bin" + mkdir -p "$out/share/picolisp" "$out/lib" "$out/bin" cp -r . "$out/share/picolisp/build-dir" ln -s "$out/share/picolisp/build-dir" "$out/lib/picolisp" ln -s "$out/lib/picolisp/bin/picolisp" "$out/bin/picolisp" diff --git a/pkgs/development/interpreters/python/pythonhome-wrapper.nix b/pkgs/development/interpreters/python/pythonhome-wrapper.nix index 2afbafe7b9141..c9cf6277b244f 100644 --- a/pkgs/development/interpreters/python/pythonhome-wrapper.nix +++ b/pkgs/development/interpreters/python/pythonhome-wrapper.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin echo ' #!/bin/sh diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index 6f29f79e2c168..727b9cbc67677 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { unpackPhase = "true"; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" for prg in 2to3 idle pydoc python python-config python${python.majorVersion} python${python.majorVersion}-config smtpd.py; do makeWrapper "$python/bin/$prg" "$out/bin/$prg" --suffix PYTHONPATH : "$PYTHONPATH" done diff --git a/pkgs/development/interpreters/spidermonkey/builder.sh b/pkgs/development/interpreters/spidermonkey/builder.sh index b0cfe6c9ed624..91110159665c0 100644 --- a/pkgs/development/interpreters/spidermonkey/builder.sh +++ b/pkgs/development/interpreters/spidermonkey/builder.sh @@ -22,9 +22,9 @@ $MAKE printlibraries $MAKE printprograms $MAKE -ensureDir $out -ensureDir $out/bin -ensureDir $out/lib +mkdir -p $out +mkdir -p $out/bin +mkdir -p $out/lib # Install the binaries that have been created. install $(cat PROGRAMS) $out/bin diff --git a/pkgs/development/libraries/Xaw3d/builder.sh b/pkgs/development/libraries/Xaw3d/builder.sh index afd640b625d61..ff42e47ea56bf 100644 --- a/pkgs/development/libraries/Xaw3d/builder.sh +++ b/pkgs/development/libraries/Xaw3d/builder.sh @@ -15,7 +15,7 @@ installPhase() { make install SHLIBDIR=$out/lib USRLIBDIR=$out/lib INCDIR=$out/include cd $out/include/X11 && ln -s Xaw3d Xaw - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" } diff --git a/pkgs/development/libraries/box2d/2.0.1.nix b/pkgs/development/libraries/box2d/2.0.1.nix index 9aa08caf00f4c..c15e27695ac90 100644 --- a/pkgs/development/libraries/box2d/2.0.1.nix +++ b/pkgs/development/libraries/box2d/2.0.1.nix @@ -48,14 +48,14 @@ rec { ''; doDeploy = a.fullDepEntry '' - ensureDir "$out"/lib - ensureDir "$out"/include/Box2D + mkdir -p "$out"/lib + mkdir -p "$out"/include/Box2D cp Library/* Source/Gen/float/lib*.{a,so} "$out"/lib cp -r Source "$out"/include/Box2D/Source find "$out"/include/Box2D/Source ! -name '*.h' -exec rm '{}' ';' sed -e s@../Source@Box2D/Source@ -i Include/Box2D.h cp Include/Box2D.h "$out"/include/Box2D - ensureDir "$out/share" + mkdir -p "$out/share" cp -r Examples "$out/share" '' ["minInit" "addInputs" "doMake" "defEnsureDir"]; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 5dbb31e9bceff..d5471b9be75f3 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -28,7 +28,7 @@ rec { '' ["minInit" "addInputs" "doUnpack"]; demoInstall = fullDepEntry('' - ensureDir $out/bin + mkdir -p $out/bin cp Demo/chipmunk_demos $out/bin '') ["doMakeInstall" "defEnsureDir"]; diff --git a/pkgs/development/libraries/clapack/default.nix b/pkgs/development/libraries/clapack/default.nix index a40044ee3a34c..d1c081f45d859 100644 --- a/pkgs/development/libraries/clapack/default.nix +++ b/pkgs/development/libraries/clapack/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildNativeInputs = [ cmake ]; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp SRC/*.a F2CLIBS/libf2c/*.a BLAS/SRC/*.a $out/lib cp ../INCLUDE/* $out/include ''; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index f070f2dfaef29..121f41a0f3c5f 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/lib $out/include + mkdir -p $out/lib $out/include ''; meta = { diff --git a/pkgs/development/libraries/dotnetfx35/default.nix b/pkgs/development/libraries/dotnetfx35/default.nix index 7ac4568a4e133..e1c59846aec53 100644 --- a/pkgs/development/libraries/dotnetfx35/default.nix +++ b/pkgs/development/libraries/dotnetfx35/default.nix @@ -8,7 +8,7 @@ in name = "dotnetfx-3.5"; src = "${windir}/Microsoft.NET/Framework/v3.5"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin ''; }; diff --git a/pkgs/development/libraries/dotnetfx40/default.nix b/pkgs/development/libraries/dotnetfx40/default.nix index b9ce4738d129c..701464071d032 100644 --- a/pkgs/development/libraries/dotnetfx40/default.nix +++ b/pkgs/development/libraries/dotnetfx40/default.nix @@ -8,7 +8,7 @@ in name = "dotnetfx-4.0"; src = "${windir}/Microsoft.NET/Framework/v4.0.30319"; buildCommand = '' - ensureDir $out/bin + mkdir -p $out/bin ln -s $src/MSBuild.exe $out/bin ''; }; diff --git a/pkgs/development/libraries/eglibc/builder.sh b/pkgs/development/libraries/eglibc/builder.sh index 47cd1b5e252f7..6ac1d223b47e1 100644 --- a/pkgs/development/libraries/eglibc/builder.sh +++ b/pkgs/development/libraries/eglibc/builder.sh @@ -20,7 +20,7 @@ preConfigure() { done # Include source for debugging - ensureDir $out/src + mkdir -p $out/src cp -R libc ports $out/src ln -s $out/src/ports $out/src/libc/ports # glibc wants -O2 minimum diff --git a/pkgs/development/libraries/glfw/default.nix b/pkgs/development/libraries/glfw/default.nix index 1454d2ec94a9a..1f4df39408e81 100644 --- a/pkgs/development/libraries/glfw/default.nix +++ b/pkgs/development/libraries/glfw/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ mesa libX11 libXext ]; buildPhase = '' - ensureDir $out + mkdir -p $out make x11-install PREFIX=$out ''; diff --git a/pkgs/development/libraries/glibc-2.13/default.nix b/pkgs/development/libraries/glibc-2.13/default.nix index 31a8ef13a4fe8..95778b50b70bd 100644 --- a/pkgs/development/libraries/glibc-2.13/default.nix +++ b/pkgs/development/libraries/glibc-2.13/default.nix @@ -28,7 +28,7 @@ in # any special hack. preInstall = '' if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/glibc-2.13/info.nix b/pkgs/development/libraries/glibc-2.13/info.nix index 84a16fefce9de..75bd996d9bc51 100644 --- a/pkgs/development/libraries/glibc-2.13/info.nix +++ b/pkgs/development/libraries/glibc-2.13/info.nix @@ -18,7 +18,7 @@ in # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" ''; diff --git a/pkgs/development/libraries/glibc-2.13/locales.nix b/pkgs/development/libraries/glibc-2.13/locales.nix index d598e0e094dc9..b7eae50ca385c 100644 --- a/pkgs/development/libraries/glibc-2.13/locales.nix +++ b/pkgs/development/libraries/glibc-2.13/locales.nix @@ -39,7 +39,7 @@ in installPhase = '' - ensureDir "$out/lib/locale" + mkdir -p "$out/lib/locale" cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; diff --git a/pkgs/development/libraries/glibc-2.14/default.nix b/pkgs/development/libraries/glibc-2.14/default.nix index 31a8ef13a4fe8..95778b50b70bd 100644 --- a/pkgs/development/libraries/glibc-2.14/default.nix +++ b/pkgs/development/libraries/glibc-2.14/default.nix @@ -28,7 +28,7 @@ in # any special hack. preInstall = '' if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/glibc-2.14/info.nix b/pkgs/development/libraries/glibc-2.14/info.nix index 84a16fefce9de..75bd996d9bc51 100644 --- a/pkgs/development/libraries/glibc-2.14/info.nix +++ b/pkgs/development/libraries/glibc-2.14/info.nix @@ -18,7 +18,7 @@ in # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir "$out/share/info" + mkdir -p "$out/share/info" cp -v "../$sourceRoot/manual/"*.info* "$out/share/info" ''; diff --git a/pkgs/development/libraries/glibc-2.14/locales.nix b/pkgs/development/libraries/glibc-2.14/locales.nix index d598e0e094dc9..b7eae50ca385c 100644 --- a/pkgs/development/libraries/glibc-2.14/locales.nix +++ b/pkgs/development/libraries/glibc-2.14/locales.nix @@ -39,7 +39,7 @@ in installPhase = '' - ensureDir "$out/lib/locale" + mkdir -p "$out/lib/locale" cp -v "$TMPDIR/nix/store/"*"/lib/locale/locale-archive" "$out/lib/locale" ''; diff --git a/pkgs/development/libraries/glibc-2.9/default.nix b/pkgs/development/libraries/glibc-2.9/default.nix index 0cfad2990383f..b778743147e67 100644 --- a/pkgs/development/libraries/glibc-2.9/default.nix +++ b/pkgs/development/libraries/glibc-2.9/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { buildNativeInputs = stdenv.lib.optionals (cross != null) [ gccCross ]; preInstall = if (cross != null) then '' - ensureDir $out/lib + mkdir -p $out/lib ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 '' else ""; diff --git a/pkgs/development/libraries/glibc-2.9/info.nix b/pkgs/development/libraries/glibc-2.9/info.nix index 3201bb4744055..cc79bbece3d2e 100644 --- a/pkgs/development/libraries/glibc-2.9/info.nix +++ b/pkgs/development/libraries/glibc-2.9/info.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { # Somehow building the info still does not work, because the final # libc.info hasn't a Top node. installPhase = '' - ensureDir $out/share/info + mkdir -p $out/share/info cp ../$sourceRoot/manual/*.info $out/share/info ''; diff --git a/pkgs/development/libraries/glibc-2.9/locales.nix b/pkgs/development/libraries/glibc-2.9/locales.nix index 3046374ca3457..c7b1bb2bff0a1 100644 --- a/pkgs/development/libraries/glibc-2.9/locales.nix +++ b/pkgs/development/libraries/glibc-2.9/locales.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/lib/locale + mkdir -p $out/lib/locale cp $TMPDIR/nix/store/*/lib/locale/locale-archive $out/lib/locale/ ''; diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index c01987bcc59d3..04fbb01a3bfcb 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["createDirs" "setVars" "doMakeInstall"]; createDirs = a.fullDepEntry '' - ensureDir "$out/"{bin,lib,share/man,share/info,include/gsm} + mkdir -p "$out/"{bin,lib,share/man,share/info,include/gsm} '' ["minInit" "defEnsureDir"]; setVars = a.noDepEntry '' diff --git a/pkgs/development/libraries/haskell/cabal/cabal.nix b/pkgs/development/libraries/haskell/cabal/cabal.nix index 3f5bac4d7e4e7..567e5e2300a79 100644 --- a/pkgs/development/libraries/haskell/cabal/cabal.nix +++ b/pkgs/development/libraries/haskell/cabal/cabal.nix @@ -126,12 +126,12 @@ ./Setup copy - ensureDir $out/bin # necessary to get it added to PATH + mkdir -p $out/bin # necessary to get it added to PATH local confDir=$out/lib/ghc-pkgs/ghc-${ghc.ghc.version} local installedPkgConf=$confDir/${self.fname}.installedconf local pkgConf=$confDir/${self.fname}.conf - ensureDir $confDir + mkdir -p $confDir ./Setup register --gen-pkg-config=$pkgConf if test -f $pkgConf; then echo '[]' > $installedPkgConf diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 76f4a5a7dae05..78206de9f1417 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preInstall = '' sed -i s,/usr/local,$out, src/makefile.linux - ensureDir $out/lib $out/include + mkdir -p $out/lib $out/include ''; meta = { diff --git a/pkgs/development/libraries/iniparser/default.nix b/pkgs/development/libraries/iniparser/default.nix index 9b45dbb91ec8c..55c4dbff29605 100644 --- a/pkgs/development/libraries/iniparser/default.nix +++ b/pkgs/development/libraries/iniparser/default.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation rec{ buildFlags = "libiniparser.so"; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cp libiniparser.so.0 $out/lib ln -s libiniparser.so.0 $out/lib/libiniparser.so - ensureDir $out/include + mkdir -p $out/include cp src/*.h $out/include - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} for i in AUTHORS INSTALL LICENSE README; do bzip2 -c -9 $i > $out/share/doc/${name}/$i.bz2; done; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index f713ef2f645a7..9cd61adf77565 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp maxmindgeoip.jar $out/share/java ''; meta = { diff --git a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh index 605daff0cc85c..d37e110011e8b 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/builder.sh +++ b/pkgs/development/libraries/java/gwt-dragdrop/builder.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/share/java +mkdir -p $out/share/java cp $src $out/share/java/$name.jar diff --git a/pkgs/development/libraries/java/gwt-widgets/builder.sh b/pkgs/development/libraries/java/gwt-widgets/builder.sh index f8961eb4f0481..8c2502385f2b5 100644 --- a/pkgs/development/libraries/java/gwt-widgets/builder.sh +++ b/pkgs/development/libraries/java/gwt-widgets/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup tar xfvz $src cd gwt-widgets-* -ensureDir $out/share/java +mkdir -p $out/share/java cp gwt-widgets-*.jar $out/share/java diff --git a/pkgs/development/libraries/java/hsqldb/builder.sh b/pkgs/development/libraries/java/hsqldb/builder.sh index 2f146a5234875..d7de23ab95eba 100755 --- a/pkgs/development/libraries/java/hsqldb/builder.sh +++ b/pkgs/development/libraries/java/hsqldb/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup unzip $src cd hsqldb* -ensureDir $out +mkdir -p $out cp -R * $out/ diff --git a/pkgs/development/libraries/java/hydra-ant-logger/default.nix b/pkgs/development/libraries/java/hydra-ant-logger/default.nix index bb8c67285c5ab..1439c6101ab94 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir "$out/lib/java" + mkdir -p "$out/lib/java" cp -v *.jar "$out/lib/java" ''; } diff --git a/pkgs/development/libraries/java/jetty-gwt/default.nix b/pkgs/development/libraries/java/jetty-gwt/default.nix index e384e35b23fa9..03433048270fb 100644 --- a/pkgs/development/libraries/java/jetty-gwt/default.nix +++ b/pkgs/development/libraries/java/jetty-gwt/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "17x8ss75rx9xjn93rq861mdn9d6gw87rbrf24blawa6ahhb56ppf"; }; buildCommand = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp $src $out/share/java/$name.jar ''; } diff --git a/pkgs/development/libraries/java/jetty-util/default.nix b/pkgs/development/libraries/java/jetty-util/default.nix index 8f1f676c10708..349339aad440c 100644 --- a/pkgs/development/libraries/java/jetty-util/default.nix +++ b/pkgs/development/libraries/java/jetty-util/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1ld94lb5dk7y6sjg1rq8zdk97wiy56ik5vbgy7yjj4f6rz5pxbyq"; }; buildCommand = '' - ensureDir $out/share/java + mkdir -p $out/share/java cp $src $out/share/java/$name.jar ''; } diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 300266fff5c0a..800ae7ba71858 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -23,7 +23,7 @@ in '' find -name \*.jar -or -name \*.class -exec rm -v {} \; # The build process tries to download it by itself. - ensureDir "build/tmp-xbean" + mkdir -p "build/tmp-xbean" ln -sv "${xbeans}" "build/tmp-xbean/xbean.zip" ''; @@ -34,7 +34,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v *.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/java/saxon/default8.nix b/pkgs/development/libraries/java/saxon/default8.nix index ab67fc6b89340..bf1ee340d46f8 100644 --- a/pkgs/development/libraries/java/saxon/default8.nix +++ b/pkgs/development/libraries/java/saxon/default8.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildCommand = " unzip $src -d $out - ensureDir $out/bin + mkdir -p $out/bin cat > $out/bin/saxon8 <<EOF #! $shell export JAVA_HOME=${jre} diff --git a/pkgs/development/libraries/java/smack/builder.sh b/pkgs/development/libraries/java/smack/builder.sh index 276e3f6e6a912..bf86d59497e46 100644 --- a/pkgs/development/libraries/java/smack/builder.sh +++ b/pkgs/development/libraries/java/smack/builder.sh @@ -2,5 +2,5 @@ source $stdenv/setup tar xfvz $src cd smack* -ensureDir $out/share/java +mkdir -p $out/share/java cp *.jar $out/share/java diff --git a/pkgs/development/libraries/java/swt/builder.sh b/pkgs/development/libraries/java/swt/builder.sh index 0a2f304801ecf..9f678d7158bb9 100644 --- a/pkgs/development/libraries/java/swt/builder.sh +++ b/pkgs/development/libraries/java/swt/builder.sh @@ -7,12 +7,12 @@ export JAVA_HOME=${jdk} echo $JAVA_HOME=${jdk} sh ./build.sh make_swt make_atk -ensureDir $out/lib +mkdir -p $out/lib cp *.so $out/lib mkdir out javac -d out/ $(find org/ -name "*.java") -ensureDir $out/jars +mkdir -p $out/jars cp version.txt out/ cd out && jar -c * > $out/jars/swt.jar diff --git a/pkgs/development/libraries/java/xalanj/default.nix b/pkgs/development/libraries/java/xalanj/default.nix index ededecdf0e510..0aee98d27bdab 100644 --- a/pkgs/development/libraries/java/xalanj/default.nix +++ b/pkgs/development/libraries/java/xalanj/default.nix @@ -24,7 +24,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v build/x*.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/java/xerces/default.nix b/pkgs/development/libraries/java/xerces/default.nix index 545bb21508c83..a40c30ae6c720 100644 --- a/pkgs/development/libraries/java/xerces/default.nix +++ b/pkgs/development/libraries/java/xerces/default.nix @@ -26,7 +26,7 @@ in # FIXME: Install javadoc as well. installPhase = - '' ensureDir "$out/lib/java" + '' mkdir -p "$out/lib/java" cp -v build/xerces*.jar "$out/lib/java" ''; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index a17cdf0b4d586..3028ba7367cb4 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp lm.h $out/include cp liblevmar.a $out/lib ''; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 7d6ddd61581fe..4ba938911a41e 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { configureScript = "./configure2"; # wtf? preConfigure = '' - ensureDir $out + mkdir -p $out ''; meta = { diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 30fd6835dfbb2..ee5d2e5e50e01 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configureScript = "./configure2"; # wtf? preConfigure = '' - ensureDir $out + mkdir -p $out ''; postInstall = '' diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index b14809d47bf85..edcf177add7fe 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = "-f makefile.u"; installPhase = '' - ensureDir $out/include $out/lib + mkdir -p $out/include $out/lib cp libf2c.a $out/lib cp f2c.h $out/include ''; diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 508827b9b3d50..c8fa978534d9c 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cd libmilter cat > a.m4 <<EOF define(\`confEBINDIR', \`$out/libexec') diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index a3a6a6423d875..ad524c21ff10e 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { sed -i s,/usr,$out, usr/lib/pkgconfig/* - ensureDir $out + mkdir -p $out cp -R usr/lib $out cp -R usr/share $out ''; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index 7ec95f03eff7c..c6446ab27a542 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-pcap=linux"; - preInstall = ''ensureDir $out/bin''; + preInstall = ''mkdir -p $out/bin''; patches = [ ./libpcap_amd64.patch ]; diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index 4e13e5768f869..29a8c459c34cd 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/include - ensureDir $out/lib + mkdir -p $out/include + mkdir -p $out/lib ''; buildInputs = [pkgconfig glib ncurses]; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index b9dbaf23512d3..b292580e70524 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/include - ensureDir $out/lib + mkdir -p $out/include + mkdir -p $out/lib ''; buildInputs = [pkgconfig glib ncurses gpm]; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index b449d9c3ed38f..20433ab145882 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { ''; preInstall = '' - ensureDir $out/include - ensureDir $out/lib + mkdir -p $out/include + mkdir -p $out/lib ''; buildInputs = [pkgconfig glib ncurses]; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 46dc1435bcd0c..05ce8019c4ec1 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [libxml2]; postInstall = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/ ''; diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix index dd0dab46b76d5..0b795e78ad501 100644 --- a/pkgs/development/libraries/ncbi/default.nix +++ b/pkgs/development/libraries/ncbi/default.nix @@ -33,7 +33,7 @@ rec { '') ["preBuild" "addInputs"]; deploy = a.fullDepEntry ('' - ensureDir $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot + mkdir -p $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot cd ncbi/build cp *.o *.so $out/lib cp -r . $out/share/${name}/build-snapshot diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index ca792ed4c914c..e03b9409cfa71 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/inc $out/include - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} cp -R ../doc $out/share/doc/${name} ''; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 6179742b42f7c..0f9a3dc2b2dad 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp exe/* $out/bin ''; } diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix index 016bd23cf1ca4..b4c8a7f17890e 100644 --- a/pkgs/development/libraries/postgis/default.nix +++ b/pkgs/development/libraries/postgis/default.nix @@ -74,7 +74,7 @@ let s=$out/bin/pg_db_postgis_enable sql_comments=$out/share/postgis-${version}/comments.sql - ensureDir $(dirname $sql_comments) + mkdir -p $(dirname $sql_comments) cp $(find -iname ${fix.fixed.sql_comments}) $sql_comments for script in $scriptNames; do diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 913f4acdc7dd5..e231c20e7a3ec 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { installPhase = '' cd .. - ensureDir $out/lib/qt4/plugins/script + mkdir -p $out/lib/qt4/plugins/script cp -av plugins/script/* $out/lib/qt4/plugins/script ''; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index a731360be562a..3537dd3b4af39 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir "$out/lib" + mkdir -p "$out/lib" install -m755 *.a* "$out/lib" install -m755 *.so* "$out/lib" ln -sf liblapack.so.3 "$out/lib/liblapack.so" diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 01dc63353d668..f18107c48a5eb 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { fi done - ensureDir $out/pcsc/drivers + mkdir -p $out/pcsc/drivers cp -R proprietary/* $out/pcsc/drivers ''; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 952d4ba9f2550..4c615b81552fd 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip scheme texinfo ]; configurePhase = '' - ensureDir "$out" + mkdir -p "$out" sed -i "Makefile" \ -e "s|^[[:blank:]]*prefix[[:blank:]]*=.*$|prefix = $out/|g" ''; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index 7776b4d025940..4e1187aa0f762 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = "aoeu"; installPhase = '' - ensureDir $out + mkdir -p $out make install DESTDIR="$out" ''; diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 211eecde4e435..8874a672ead0b 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -35,7 +35,7 @@ rec { '' ["minInit" "doUnpack"]; doDeploy = a.fullDepEntry '' - ensureDir "$out"/{bin,lib} + mkdir -p "$out"/{bin,lib} for d in bin lib; do for i in ./$d/*; do test "$(basename "$i")" = "Makefile" || diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index b025e9a68a9b3..dafa82bad3479 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation (rec { outputs = [ "out" "lib" "headers" ]; postInstall = '' - ensureDir $lib + mkdir -p $lib cp -av $out/lib* $lib - ensureDir $headers + mkdir -p $headers cp -av $out/include $headers ''; })) diff --git a/pkgs/development/libraries/suitesparse/default.nix b/pkgs/development/libraries/suitesparse/default.nix index 00558fc52e9d5..d1611cda623a7 100644 --- a/pkgs/development/libraries/suitesparse/default.nix +++ b/pkgs/development/libraries/suitesparse/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { preConfigure = '' export PREFIX=$out - ensureDir $out/lib - ensureDir $out/include + mkdir -p $out/lib + mkdir -p $out/include ''; NIX_CFLAGS = "-fPIC"; diff --git a/pkgs/development/libraries/tcp-wrappers/default.nix b/pkgs/development/libraries/tcp-wrappers/default.nix index 1cb6472971c47..14335e6a3adb6 100644 --- a/pkgs/development/libraries/tcp-wrappers/default.nix +++ b/pkgs/development/libraries/tcp-wrappers/default.nix @@ -50,7 +50,7 @@ rec { '' ["minInit"]; doDeploy = a.fullDepEntry '' - ensureDir "$out"/{sbin,lib} + mkdir -p "$out"/{sbin,lib} make libwrap.so cp libwrap.{a,so} "$out/lib" find . -perm +111 -a ! -name '*.*' -exec cp '{}' "$out/sbin" ';' diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 1fbfdc58fceb9..e669f8a254f1c 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -es"|/etc/netconfig|$out/etc/netconfig|g" -i "Makefile.in" ''; - preInstall = "ensureDir $out/etc"; + preInstall = "mkdir -p $out/etc"; doCheck = true; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 9e60f1ce8ba15..b67b015e018db 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/lib + mkdir -p $out/bin + mkdir -p $out/lib cp -v libv8.* $out/lib cp -v shell $out/bin/v8-shell diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix index 63c6574d32ad5..2daa1796318f1 100644 --- a/pkgs/development/libraries/webkit/default.nix +++ b/pkgs/development/libraries/webkit/default.nix @@ -69,7 +69,7 @@ rec { '') ["minInit" "doUnpack"]; doAddPrograms = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin for i in Programs/.libs/* Programs/*; do cp $i $out/bin/webkit-program-$(basename $i) || true done diff --git a/pkgs/development/libraries/webkit/svn.nix b/pkgs/development/libraries/webkit/svn.nix index 5eaaeec3d168a..d41d4683d6e98 100644 --- a/pkgs/development/libraries/webkit/svn.nix +++ b/pkgs/development/libraries/webkit/svn.nix @@ -70,7 +70,7 @@ rec { '') ["minInit" "doUnpack"]; doAddPrograms = fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin for i in Programs/.libs/* Programs/*; do cp $i $out/bin/webkit-program-$(basename $i) || true done diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 5ccfc1a7391fd..6db9469e46d2f 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -5,7 +5,7 @@ pushd unzipped unzip $src || true popd -ensureDir $out +mkdir -p $out mv unzipped/* $out/ # Remove crap in the root directory. diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix index 3417596c3930d..b6bc94814e643 100644 --- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix +++ b/pkgs/development/libraries/xapian/bindings/1.0.x.nix @@ -23,7 +23,7 @@ composableDerivation.composableDerivation {} rec { # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook ''; @@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec { preConfigure = '' export RUBY_LIB=$out/${ruby.libPath} export RUBY_LIB_ARCH=$RUBY_LIB - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix index bb7643330a08d..93d31ada975cf 100644 --- a/pkgs/development/libraries/xapian/bindings/default.nix +++ b/pkgs/development/libraries/xapian/bindings/default.nix @@ -23,7 +23,7 @@ composableDerivation.composableDerivation {} rec { # export same env vars as in pythonNew preConfigure = '' export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook ''; @@ -46,7 +46,7 @@ composableDerivation.composableDerivation {} rec { preConfigure = '' export RUBY_LIB=$out/${ruby.libPath} export RUBY_LIB_ARCH=$RUBY_LIB - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook ''; diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index d8bc32350fb96..07220d6e1a65d 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "xlibs-wrapper"; buildPhase = "true"; - installPhase = "ensureDir $out"; + installPhase = "mkdir -p $out"; unpackPhase = "sourceRoot=."; propagatedBuildInputs = packages; } // { diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index 7c9fb19c27543..f79483874f6bd 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { # move to nix-support to not create that many symlinks.. # TODO burnomat tries to read /usr/local/etc/avrdude.conf (but you can edit it within the settings dialog) installPhase = '' - ensureDir $out/{nix-support,bin} + mkdir -p $out/{nix-support,bin} mv *.jar license_gpl-3.0.txt lib *.xml *.png $out/nix-support cat >> $out/bin/avr8-burn-omat << EOF #!/bin/sh diff --git a/pkgs/development/misc/windows-sdk/builder.sh b/pkgs/development/misc/windows-sdk/builder.sh index e834479882670..8f1eaffbcaf9b 100644 --- a/pkgs/development/misc/windows-sdk/builder.sh +++ b/pkgs/development/misc/windows-sdk/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out n=1 for p in $srcs; do @@ -21,7 +21,7 @@ done while read target; do read source echo "$source -> $target" - ensureDir "$out/$(dirname "$target")" + mkdir -p "$out/$(dirname "$target")" cp "$source" "$out/$target" done < $filemap diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index a7c96f1d2ea78..3ecf2ae46994a 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { configurePhase = "true"; # Skip configure preInstall = '' - ensureDir "$out/lib/ocaml/${ocaml_version}/site-lib" + mkdir -p "$out/lib/ocaml/${ocaml_version}/site-lib" ''; doCheck = true; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 8aa3f2ba77e79..48e86ed9a68ff 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildFlags = "setup.data build"; - preBuild = "ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; + preBuild = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 13c25495cdc6d..976910aae29aa 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; buildPhase = '' - ensureDir .test + mkdir -p .test make make opt ''; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 9b477fed85173..1903068bb0b2f 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preConfigure = '' export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR - ensureDir $out/bin + mkdir -p $out/bin ''; createFindlibDestdir = true; diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix index adf66a4480655..858d459f5ca17 100644 --- a/pkgs/development/perl-modules/DB_File/default.nix +++ b/pkgs/development/perl-modules/DB_File/default.nix @@ -21,7 +21,7 @@ buildPerlPackage { # lib/perl5/site_perl, and the *.pm should be inside lib/perl5/site_perl/... # for other packages to get that in the PERL5LIB env var. postInstall = '' - ensureDir $out/lib/perl5/site_perl/ + mkdir -p $out/lib/perl5/site_perl/ cp -R $out/lib/perl5/5* $out/lib/perl5/site_perl ''; } diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 46149177320d9..4e0b610023167 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -50,7 +50,7 @@ python.stdenv.mkDerivation (attrs // { # XXX: Should we run `easy_install --always-unzip'? It doesn't seem # to have a noticeable impact on small scripts. installPhase = '' - ensureDir "$out/lib/${python.libPrefix}/site-packages" + mkdir -p "$out/lib/${python.libPrefix}/site-packages" echo "installing \`${name}' with \`easy_install'..." export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index 3fc8058dfb2a3..df5d37853f72c 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["mkDirs" "installPythonPackage"]; mkDirs = a.fullDepEntry('' - ensureDir $out/bin $out/lib $out/share $(toPythonPath $out) + mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out) export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out) '') ["defEnsureDir" "addInputs"]; diff --git a/pkgs/development/ruby-modules/rake/default.nix b/pkgs/development/ruby-modules/rake/default.nix index 00bad68b695e1..e1cec53aaa061 100644 --- a/pkgs/development/ruby-modules/rake/default.nix +++ b/pkgs/development/ruby-modules/rake/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation { ''; buildPhase = "true"; installPhase = '' - ensureDir $out/lib - ensureDir $out/bin + mkdir -p $out/lib + mkdir -p $out/bin export DESTDIR=$out ruby install.rb ''; diff --git a/pkgs/development/ruby-modules/sqlite3/default.nix b/pkgs/development/ruby-modules/sqlite3/default.nix index a37e91c488ff7..33a8951921e7a 100644 --- a/pkgs/development/ruby-modules/sqlite3/default.nix +++ b/pkgs/development/ruby-modules/sqlite3/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ruby sqlite]; buildPhase = "true"; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib ruby setup.rb config --prefix=$out # --bindir $out/bin --libdir $out/lib ruby setup.rb setup diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 17fc8de8c95ca..09656dc520a85 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/checkstyle + mkdir -p $out/checkstyle cp -R * $out/checkstyle ''; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 97e061d6b3f59..8275beff88d0c 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [unzip]; installPhase = '' - ensureDir $out/lib/jars + mkdir -p $out/lib/jars cp lib/*.jar $out/lib/jars/ ''; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index cf4f87f528e12..0623632936d75 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -prd bin lib plugin doc $out/ rm $out/bin/*.bat ''; diff --git a/pkgs/development/tools/analysis/jdepend/default.nix b/pkgs/development/tools/analysis/jdepend/default.nix index 6973fbad9e7c3..7498d3b652ac8 100644 --- a/pkgs/development/tools/analysis/jdepend/default.nix +++ b/pkgs/development/tools/analysis/jdepend/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out + mkdir -p $out cp -R * $out ''; diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix index 7f50431c8d9a7..b830ee008389f 100644 --- a/pkgs/development/tools/analysis/pmd/default.nix +++ b/pkgs/development/tools/analysis/pmd/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out + mkdir -p $out cp -R * $out ''; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index cedd9584414fb..b4fdd4c09d4de 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { sed -i -e 's/-DNXT/-DNXT -DCPP="\\"gcc -E -x c\\""/' makefile ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ../Xspin*/xsp* $out/bin/xspin sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \ -e '/exec wish/d' $out/bin/xspin diff --git a/pkgs/development/tools/build-managers/apache-ant/from-source.nix b/pkgs/development/tools/build-managers/apache-ant/from-source.nix index a5a19a6714368..ef6763a0fa28a 100644 --- a/pkgs/development/tools/build-managers/apache-ant/from-source.nix +++ b/pkgs/development/tools/build-managers/apache-ant/from-source.nix @@ -39,7 +39,7 @@ EOF # Note: We don't build the javadoc. buildPhase = '' - ensureDir "$out" + mkdir -p "$out" ./build.sh -Dant.install="$out" install-lite ''; @@ -48,7 +48,7 @@ EOF # rearrange a few things. rm -v "$out/bin/"*.bat - ensureDir "$out/lib/java" + mkdir -p "$out/lib/java" mv -v "$out/lib/"*.jar "$out/lib/java" sed -i "$out/bin/ant" \ -e "s|^ANT_LIB=.*$|ANT_LIB=$out/lib/java|g ; diff --git a/pkgs/development/tools/build-managers/bam/default.nix b/pkgs/development/tools/build-managers/bam/default.nix index ef5aed1f26edb..e7e4b6d090922 100644 --- a/pkgs/development/tools/build-managers/bam/default.nix +++ b/pkgs/development/tools/build-managers/bam/default.nix @@ -38,9 +38,9 @@ rec { '' ["build" "addInputs"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/share/bam" + mkdir -p "$out/share/bam" cp -r docs examples tests "$out/share/bam" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp bam "$out/bin" '' ["minInit" "defEnsureDir" "build"]; diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 92b63869f33be..71862ec1cf75e 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage (rec { doCheck = false; postInstall = - '' ensureDir "$out/share/info" + '' mkdir -p "$out/share/info" make -C docs buildbot.info cp -v "docs/buildbot.info"* "$out/share/info" ''; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 9fc25aad64d21..576d8e357f4b8 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out + mkdir -p $out rm bin/*.bat mv * $out ''; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index d2a002a70cf79..6324fa92cbd92 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp bin.linux/jam $out/bin ''; diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 50dc907a78043..bf927db2793c4 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ tk makeWrapper ]; installPhase = '' - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} cp -R * $out/share/${name}/ makeWrapper $out/share/${name}/cbrowser $out/bin/cbrowser \ diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index c27c7ab291a29..3cba5cd2e76a2 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { # Install Emacs mode. cd "contrib/xcscope" - ensureDir "$out/libexec/cscope" + mkdir -p "$out/libexec/cscope" cp "cscope-indexer" "$out/libexec/cscope" - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" emacs --batch --eval '(byte-compile-file "xcscope.el")' cp xcscope.el{,c} "$out/share/emacs/site-lisp" ''; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index fef5a71201ab7..6e6464a590beb 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = true; postInstall = '' - ensureDir "$out/share/emacs/site-lisp" + mkdir -p "$out/share/emacs/site-lisp" cp -v *.el "$out/share/emacs/site-lisp" ''; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index f679577a3f1a0..69503782d6efc 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configurePhase = "./Configure -n linux;"; installPhase = '' - ensureDir $out/bin $out/man/man8 + mkdir -p $out/bin $out/man/man8 cp lsof.8 $out/man/man8/ cp lsof $out/bin ''; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index dddb577edbf31..1cb491df8d1ec 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -25,12 +25,12 @@ stdenv.mkDerivation { installPhase = '' cd ../.. - ensureDir $out/bin + mkdir -p $out/bin cp ninka.pl $out/bin cp -av {extComments,splitter,filter,senttok,matcher} $out/bin cd comments/comments - ensureDir $out/{bin,share/man/man1} + mkdir -p $out/{bin,share/man/man1} make install ''; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 906770e90665d..e7adb30d3166c 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -37,9 +37,9 @@ stdenv.mkDerivation rec { checkPhase = ''HOME="$TMPDIR" PATH="$PWD:$PATH" make test''; preInstall = '' - ensureDir "$out/bin" - ensureDir "$out/share/man/man1" - ensureDir "$out/share/doc" + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" + mkdir -p "$out/share/doc" ''; meta = { diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 30afee4586b05..f4b38f4f7abcd 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp unifdef $out/bin ''; diff --git a/pkgs/development/tools/misc/usb-modeswitch/default.nix b/pkgs/development/tools/misc/usb-modeswitch/default.nix index a883024690aee..48a823c3c6569 100644 --- a/pkgs/development/tools/misc/usb-modeswitch/default.nix +++ b/pkgs/development/tools/misc/usb-modeswitch/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' find -type f | xargs sed 's@/bin/rm@rm@g' -i make clean - ensureDir $out/{etc,lib/udev,share/man/man1} + mkdir -p $out/{etc,lib/udev,share/man/man1} makeFlags="DESTDIR=$out PREFIX=$out" ''; diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 8f77c0c6fc0d1..d049377ea9494 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl - ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml + mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml ''; meta = { diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 70fb45a197958..c89af03097d7b 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml_version}/site-lib/" if test -n "$createFindlibDestdir"; then - ensureDir $OCAMLFIND_DESTDIR + mkdir -p $OCAMLFIND_DESTDIR fi } diff --git a/pkgs/development/tools/parsing/antlr/builder.sh b/pkgs/development/tools/parsing/antlr/builder.sh index 1d9f352c56989..b8e7791b6fc9b 100644 --- a/pkgs/development/tools/parsing/antlr/builder.sh +++ b/pkgs/development/tools/parsing/antlr/builder.sh @@ -4,8 +4,8 @@ tar zxvf $src cd antlr-* cd lib -ensureDir $out/lib/antlr -ensureDir $out/bin +mkdir -p $out/lib/antlr +mkdir -p $out/bin cp *.jar $out/lib/antlr diff --git a/pkgs/development/tools/parsing/frown/builder.sh b/pkgs/development/tools/parsing/frown/builder.sh index 82689b42d72d0..075d2bc758c5b 100644 --- a/pkgs/development/tools/parsing/frown/builder.sh +++ b/pkgs/development/tools/parsing/frown/builder.sh @@ -2,6 +2,6 @@ source $stdenv/setup makeFlags="-e PREFIX=\"$out\"" -ensureDir $out/bin +mkdir -p $out/bin genericBuild diff --git a/pkgs/development/tools/parsing/jikespg/builder.sh b/pkgs/development/tools/parsing/jikespg/builder.sh index 090def7c46434..e63ec9808f23a 100644 --- a/pkgs/development/tools/parsing/jikespg/builder.sh +++ b/pkgs/development/tools/parsing/jikespg/builder.sh @@ -8,7 +8,7 @@ configurePhase() { } installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp jikespg $out/bin } diff --git a/pkgs/development/tools/selenium/remote-control/default.nix b/pkgs/development/tools/selenium/remote-control/default.nix index 0a7a12a6e1711..fbe11ed2bc040 100644 --- a/pkgs/development/tools/selenium/remote-control/default.nix +++ b/pkgs/development/tools/selenium/remote-control/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { buildInputs = [unzip]; phases = "unpackPhase buildPhase"; buildPhase = '' - ensureDir $out/{bin,lib} + mkdir -p $out/{bin,lib} mv * $out/lib bin="$out/bin/selenium-remote-control" cat >> "$bin" << EOF @@ -37,7 +37,7 @@ in stdenv.mkDerivation { }; phases = "buildPhase"; buildPhase = '' - ensureDir $out/{bin,lib} + mkdir -p $out/{bin,lib} cp $src $out/lib/ bin="$out/bin/selenium-remote-control" cat >> "$bin" << EOF diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 6f09603b2d56b..668ff6a7f4ae9 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installPhase = '' sed -i "s/path\.join/path\.resolve/g" cli.js # fixes csslint issue #167 - ensureDir $out/bin; + mkdir -p $out/bin; cp -r * $out/bin mv $out/bin/cli.js $out/bin/csslint ''; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 73d08fda79f6d..3bb17b3e02f90 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -19,7 +19,7 @@ let installPhase = '' make INSTBASEDIR=$out install if [ -d $out/man ]; then - ensureDir $out/share + mkdir -p $out/share mv -v $out/man $out/share/ fi ''; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index e41e88fc1b066..2e252a5cd540a 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin install -v -m755 beret $out/bin - ensureDir $out/share + mkdir -p $out/share cp -av tahoma.ttf images music rooms sfx $out/share ''; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 8a79326bdead5..61e8571c47669 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/opt/$name + mkdir -p $out/bin $out/opt/$name cp objs/blackshades $out/bin cp -R Data IF* Readme $out/opt/$name/ ''; diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index 64d94196c64db..63139872cf9ca 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin $out/opt/$name + mkdir -p $out/bin $out/opt/$name cp objs/blackshades $out/bin/blackshadeselite cp -R Data IF* Readme $out/opt/$name/ ''; diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix index 07778363fd544..6e1af276c1fa3 100644 --- a/pkgs/games/castle-combat/default.nix +++ b/pkgs/games/castle-combat/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; postInstall = '' - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -rv "data/"* "$out/share/${name}" mv -v "$out/bin/castle-combat.py" "$out/bin/castle-combat" diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index f12caaae53f73..9d363851148dd 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { installPhase = '' set -x - ensureDir $out/bin - ensureDir $out/share/df_linux + mkdir -p $out/bin + mkdir -p $out/share/df_linux cp -r * $out/share/df_linux cp $permission $out/share/df_linux/nix_permission diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index b99f8b09b9de6..6eab8acce7517 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' # Install binaries - ensureDir $out/bin + mkdir -p $out/bin cp eduke32 mapster32 $out/bin # Make wrapper script @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod 755 $out/bin/eduke32-wrapper # Install desktop item - ensureDir $out/share/applications + mkdir -p $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications ''; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index a1b7262f3b97d..1f879393868f1 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # The user will need to have all the files in '.' to run egoboo, with # writeable controls.txt and setup.txt installPhase = '' - ensureDir $out/share/${name} + mkdir -p $out/share/${name} cp -v game/egoboo $out/share/${name} cd .. cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 4d71260143590..e784cc109f53e 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { postInstall = '' - ensureDir $out/share/exult/music + mkdir -p $out/share/exult/music for i in $musicFiles; do unzip -o -d $out/share/exult/music $i done diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index a7d906ed9b8ed..fe90156d84cf2 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -38,7 +38,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall" "deployData"]; deployData = a.fullDepEntry '' - ensureDir "$out/share/FlightGear" + mkdir -p "$out/share/FlightGear" cd "$out/share/FlightGear" tar xvf ${datasrc} '' ["minInit" "defEnsureDir"]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 2752e565c58cc..ba6b65d602b4b 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/libexec + mkdir -p $out/bin $out/libexec cp sand $out/libexec echo -e '#! /bin/sh\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg chmod a+x $out/bin/fsg diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index e5e5c94d4603a..ee792ef1e4d93 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp icbm3d $out/bin ''; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index d7fcb7a3f4e50..0d46e187d7b6e 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { inherit games; installPhase = '' - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} cp sdl-instead $out/bin cp -R games languages stead themes $out/share/${name} pushd $out/share/${name}/games diff --git a/pkgs/games/keen4/builder.sh b/pkgs/games/keen4/builder.sh index f9c62c83ddd35..50d261db8651a 100644 --- a/pkgs/games/keen4/builder.sh +++ b/pkgs/games/keen4/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup -ensureDir $out/share/keen4 +mkdir -p $out/share/keen4 unzip -j $dist -d $out/share/keen4 -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/keen4 <<EOF #! $SHELL -e if test -z "\$HOME"; then diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 991afca6180c1..34094b637fce3 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { installPhase = '' cd .. find -name '*.svn' -exec rm -rf {} \; - ensureDir "$out/share/mars/" - ensureDir "$out/bin/" + mkdir -p "$out/share/mars/" + mkdir -p "$out/bin/" cp -rv data resources credits.txt license.txt "$out/share/mars/" cp -v mars "$out/bin/mars.bin" cat << EOF > "$out/bin/mars" diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index f6e571404d6e5..36ccbf98274f9 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE="-include ${zlib}/include/zlib.h"; postInstall = '' - ensureDir $out/share/naev + mkdir -p $out/share/naev cp -v $srcData $out/share/naev/ndata wrapProgram $out/bin/naev --add-flags $out/share/naev/ndata ''; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 0d68b681ba553..d817cf6432385 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -36,7 +36,7 @@ rec { '') ["minInit" "doUnpack"]; postInstall = a.fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin ln -s $out/games/nethack $out/bin/nethack sed -i $out/bin/nethack -e '5aNEWHACKDIR="$HOME/.nethack"' sed -i $out/bin/nethack -e '6amkdir -p "$NEWHACKDIR/save"' diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 7e2df42a2931d..1ebb4b69b6e11 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "export HOME=$TMPDIR"; installPhase = '' - ensureDir $out/bin $out + mkdir -p $out/bin $out cp -R data locale $out cp neverball $out/bin cp neverputt $out/bin diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index fd2a2f18f39d3..751941bdfc1e8 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -43,7 +43,7 @@ rec { '') ["doUnpack" "addInputs" "setParams"]; doInstall = a.fullDepEntry ('' - ensureDir $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR + mkdir -p $BIN_DIR $SYSTEM_DATA_DIR $DOC_DIR $PIXMAP_DIR bash install.sh '') ["doBuild" "addInputs" "setParams" "defEnsureDir"]; diff --git a/pkgs/games/orbit/default.nix b/pkgs/games/orbit/default.nix index 65e394f60bb24..9769e6f5d670a 100644 --- a/pkgs/games/orbit/default.nix +++ b/pkgs/games/orbit/default.nix @@ -22,7 +22,7 @@ with builderDefs; sed -e 's@/usr/share/games/orbit/@'$out'/dump/@g' -i *.c sed -e '/DIR=/d; s/-lesd//; s/-DESD//;' -i Makefile make - ensureDir $out/bin + mkdir -p $out/bin cp -r .. $out/dump cat >$out/bin/space-orbit <<EOF #! /bin/sh diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index 281bd8966f6fb..24baff5394a89 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { preConfigure = '' sed -i s,/usr/local,$out, Makefile - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 1fe925e31b6ad..bb67f422c9dfc 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp vegastrike $out/bin cp vegaserver $out/bin ''; diff --git a/pkgs/games/quake3/demo/builder.sh b/pkgs/games/quake3/demo/builder.sh index 640401a0ec85a..40b0a547243b2 100644 --- a/pkgs/games/quake3/demo/builder.sh +++ b/pkgs/games/quake3/demo/builder.sh @@ -5,5 +5,5 @@ chmod -R +w . tail -n +175 $update | tar xvfz - chmod -R +w . -ensureDir $out/baseq3 +mkdir -p $out/baseq3 cp demoq3/*.pk3 baseq3/*.pk3 $out/baseq3 diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index 3b82ebb83a8d9..e1a78750535a7 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { buildInputs = [x11 SDL mesa openal]; preInstall = '' - ensureDir $out/baseq3 + mkdir -p $out/baseq3 installTargets=copyfiles installFlags="COPYDIR=$out" ''; diff --git a/pkgs/games/quake3/wrapper/builder.sh b/pkgs/games/quake3/wrapper/builder.sh index 57d6bc6a5ba24..6b5bd7450c570 100644 --- a/pkgs/games/quake3/wrapper/builder.sh +++ b/pkgs/games/quake3/wrapper/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/baseq3 +mkdir -p $out/baseq3 for i in $paks; do if test -d "$paks/baseq3"; then ln -s $paks/baseq3/* $out/baseq3/ diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 8fc623184ed9e..e76489309ccbd 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -40,9 +40,9 @@ stdenv.mkDerivation rec { installPhase = '' sed -e "s@/usr/local/lib/OGRE@${ogre}/lib/OGRE@" -i ../bin/plugins.cfg sed -e "/CgProgramManager/d" -i ../bin/plugins.cfg - ensureDir $out/share/rigsofrods + mkdir -p $out/share/rigsofrods cp -r .. $out/share/rigsofrods/build-dir - ensureDir $out/bin + mkdir -p $out/bin for i in RoR rorconfig RoRViewer; do echo '#! ${stdenv.shell}' >> "$out/bin/$i" if [ "$i" = "rorconfig" ]; then diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index aca16d14e36c7..ff99b428cef7a 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -37,7 +37,7 @@ rec { ''; doUnpack = a.fullDepEntry '' - ensureDir $out/share/sauerbraten/build-dir + mkdir -p $out/share/sauerbraten/build-dir ln -s $out/share/sauerbraten/build-dir cd $out/share/sauerbraten/build-dir (cd ${src}; find . -type d) | tail -n +2 | xargs -L 1 mkdir @@ -50,7 +50,7 @@ rec { doCreateScripts = a.fullDepEntry '' cd .. - ensureDir $out/bin + mkdir -p $out/bin echo '#! /bin/sh' >> $out/bin/sauerbraten_server echo 'cd "'"$out"'/share/sauerbraten/build-dir"' >> $out/bin/sauerbraten_server echo './bin_unix/native_server "$@"' >> $out/bin/sauerbraten_server diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 511aa850ff93e..c0f9d213762bd 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { mv sim simutrans/ - ensureDir $out/simutrans + mkdir -p $out/simutrans cp -r simutrans $out - ensureDir $out/bin + mkdir -p $out/bin ln -s $out/simutrans/sim $out/bin/simutrans ''; diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 45b5988e88cf1..18a911d563bd8 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/share/teetertorture + mkdir -p $out/bin $out/share/teetertorture cp teetertorture $out/bin cp -R data/* $out/share/teetertorture ''; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 7824fbd9bdf05..c685f11c4c161 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { installPhase = '' # Copy the graphics, sounds, etc. - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -rv data other/icons "$out/share/${name}" # Copy the executables (client, server, etc.). - ensureDir "$out/bin" + mkdir -p "$out/bin" executables="" for file in * do @@ -46,7 +46,7 @@ EOF done # Copy the documentation. - ensureDir "$out/doc/${name}" + mkdir -p "$out/doc/${name}" cp -v *.txt "$out/doc/${name}" ''; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index bd1885f9bd95c..99f73e07a631b 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -38,9 +38,9 @@ rec { ''; doDeploy = a.fullDepEntry '' - ensureDir "$out/share/tbe" + mkdir -p "$out/share/tbe" cp -r . "$out/share/tbe/build-dir" - ensureDir "$out/bin" + mkdir -p "$out/bin" echo '#! /bin/sh' >> "$out/bin/tbe" echo "$out/share/tbe/build-dir/tbe \"\$@\"" >> "$out/bin/tbe" chmod a+x "$out/bin/tbe" diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix index 68d44364f5982..04438cf70addf 100644 --- a/pkgs/games/thePenguinMachine/default.nix +++ b/pkgs/games/thePenguinMachine/default.nix @@ -26,9 +26,9 @@ stdenv.mkDerivation { ''; installPhase = '' python setup.py install --prefix=$out - ensureDir "$out"/share/tpm/ + mkdir -p "$out"/share/tpm/ cp -r . "$out"/share/tpm/build-dir - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! /bin/sh" >> "$out/bin/tpm" echo "export PYTHONPATH=\"\$PYTHONPATH:$PYTHONPATH:$(echo ${pil}/lib/python*/site-packages/PIL)\"" >> "$out/bin/tpm" echo "cd \"$out/share/tpm/build-dir\"" >> "$out/bin/tpm" diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index f945e99c071bf..22d8c944fa8bf 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { CXXFLAGS = CFLAGS; dontStrip = debug; postUnpack = optionalString debug - "ensureDir $out/src; cp -R * $out/src ; cd $out/src"; + "mkdir -p $out/src; cp -R * $out/src ; cd $out/src"; NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL"; configureFlags = optionalString debug "--enable-debug"; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index a4a887e2ed3d7..bef4b63b0cc8f 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' arch=$(uname -m | sed -e s/i.86/x86/) - ensureDir $out/opt/tremulous + mkdir -p $out/opt/tremulous cp -v Release_1.011/build/release-linux-$arch/tremulous.$arch $out/opt/tremulous/ cp -v mg_tremded_source/build/release-linux-$arch/tremded.$arch $out/opt/tremulous/ cp -rv base $out/opt/tremulous - ensureDir $out/bin + mkdir -p $out/bin for b in tremulous tremded do cat << EOF > $out/bin/$b diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index ecc3c1a36fc2c..fca8ddb889a28 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installPhase = '' jam install - ensureDir $out/share + mkdir -p $out/share pushd $out/share tar xf $srcData ''; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index dc870c79aba10..74448cdad76f7 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' destDir="$out/opt/urbanterror" - ensureDir "$destDir" - ensureDir "$out/bin" + mkdir -p "$destDir" + mkdir -p "$out/bin" cp -v ioUrbanTerrorClientSource/build/release-linux-*/ioUrbanTerror.* \ "$destDir/ioUrbanTerror" cp -v ioUrbanTerrorServerSource/build/release-linux-*/ioUrTded.* \ diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh index 5dbb451272adc..53ef90a615b06 100644 --- a/pkgs/games/ut2004demo/make-wrapper.sh +++ b/pkgs/games/ut2004demo/make-wrapper.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/ut2004demo <<EOF #! $SHELL -e diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index 5f9031ceeaa81..6f0fb48f0a5f9 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { preConfigure = '' sed -i s,/usr/local,$out, Makefile - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index c70b6f6f22e66..c584319bdc9b9 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cd warsow_${version}_sdk unzip $src1 unzip $src2 - ensureDir source/release/ + mkdir -p source/release/ mv warsow_${mversion}_unified/basewsw source/release/ cd source ''; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { for f in warsow wsw_server wswtv_server; do substituteInPlace $f --replace BINARY_DIR= BINARY_DIR=$dest done - ensureDir $dest - ensureDir $out/bin + mkdir -p $dest + mkdir -p $out/bin cp -v {warsow,wsw_server,wswtv_server}.* $dest cp -rv basewsw libs $dest cp -v warsow wsw_server wswtv_server $out/bin diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 8ac05d9ef72c1..3553649dccb81 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-release ''; installPhase = '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp darkplaces-dedicated "$out/bin/xonotic-dedicated" cp darkplaces-sdl "$out/bin/xonotic-sdl" cd ../.. - ensureDir "$out/share/xonotic" + mkdir -p "$out/share/xonotic" mv data "$out/share/xonotic" ''; dontPatchELF = true; diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix index b3b3954da8cfa..b8917b4d41c9b 100644 --- a/pkgs/games/xsokoban/default.nix +++ b/pkgs/games/xsokoban/default.nix @@ -38,7 +38,7 @@ rec { preBuild = a.fullDepEntry ('' sed -e "s@/usr/local/@$out/@" -i Makefile sed -e "s@ /bin/@ @" -i Makefile - ensureDir $out/bin $out/share $out/man/man1 $out/lib + mkdir -p $out/bin $out/share $out/man/man1 $out/lib '') ["minInit" "doConfigure" "defEnsureDir"]; name = "xsokoban-" + version; diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix index dd654edcfe199..b94633d8d3a6f 100644 --- a/pkgs/games/zangband/default.nix +++ b/pkgs/games/zangband/default.nix @@ -21,9 +21,9 @@ rec { sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in sed -e '/FIXED_PATHS/d' -i src/z-config.h ./bootstrap - ensureDir $out/share/games/zangband - ensureDir $out/share/man - ensureDir $out/bin + mkdir -p $out/share/games/zangband + mkdir -p $out/share/man + mkdir -p $out/bin '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"]; postInstall = a.fullDepEntry ('' diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 731a5e40fd808..d9fcb47bcc36e 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS="-L${mysql}/lib/mysql"; installPhase = '' - ensureDir $out/bin $out/share/zod + mkdir -p $out/bin $out/share/zod pushd $out/share/zod unrar x $srcAssets popd diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index feb42296c9d8b..d78e1674d871c 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/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 diff --git a/pkgs/misc/emulators/atari800/builder.sh b/pkgs/misc/emulators/atari800/builder.sh index f0fcb5150c886..afb9404657ae5 100644 --- a/pkgs/misc/emulators/atari800/builder.sh +++ b/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 } diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index 5ce5512119d3a..15ab18495d271 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/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 ''; diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 8a7bff6f7e483..eff47c9c503b8 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/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 ''; diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 62ecb6e4156d0..e3c9dbc84e5d6 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/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 ''; diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index b3897154e9acc..150042ad7963e 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/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 ''; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 425080d7c6253..12f1222553efa 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/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 ''; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index ca4fe2657bff8..ef8cb7d0a927f 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/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 ''; diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix index ad126b45daa41..5cad3c964e45c 100644 --- a/pkgs/misc/gxemul/default.nix +++ b/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; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 88bc4dff54041..bb11e5d5f043b 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/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 ''; diff --git a/pkgs/misc/misc.nix b/pkgs/misc/misc.nix index 1b026ebb684b3..de23d6fa2c8d7 100644 --- a/pkgs/misc/misc.nix +++ b/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 diff --git a/pkgs/misc/sane-backends/default.nix b/pkgs/misc/sane-backends/default.nix index 458985c61f733..3f9ecdccb408f 100644 --- a/pkgs/misc/sane-backends/default.nix +++ b/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 diff --git a/pkgs/misc/sane-backends/snapshot.nix b/pkgs/misc/sane-backends/snapshot.nix index 8725206ddce35..636ae37ec05b6 100644 --- a/pkgs/misc/sane-backends/snapshot.nix +++ b/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 diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 64674d78ac77b..dca60f55af036 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/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 = { diff --git a/pkgs/misc/screensavers/rss-glx/builder.sh b/pkgs/misc/screensavers/rss-glx/builder.sh index 00ec2e065bd20..a0c138d5e0475 100644 --- a/pkgs/misc/screensavers/rss-glx/builder.sh +++ b/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 diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix index 42101fa6ffe48..e3993d0daeac4 100644 --- a/pkgs/misc/source-and-tags/default.nix +++ b/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 ''; }; diff --git a/pkgs/misc/tex/lazylist/builder.sh b/pkgs/misc/tex/lazylist/builder.sh index 140b07f7be70e..cdab5bb8c9788 100644 --- a/pkgs/misc/tex/lazylist/builder.sh +++ b/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" } diff --git a/pkgs/misc/tex/lkproof/default.nix b/pkgs/misc/tex/lkproof/default.nix index 2d3a1e5f19cc2..936e4a31af123 100644 --- a/pkgs/misc/tex/lkproof/default.nix +++ b/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 "; } diff --git a/pkgs/misc/tex/nix/animatedot.sh b/pkgs/misc/tex/nix/animatedot.sh index 2e1868d4bebdd..46a2c515e03ae 100644 --- a/pkgs/misc/tex/nix/animatedot.sh +++ b/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..."; diff --git a/pkgs/misc/tex/nix/default.nix b/pkgs/misc/tex/nix/default.nix index f5a34fb67a2c3..9ae567e635b76 100644 --- a/pkgs/misc/tex/nix/default.nix +++ b/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 \ diff --git a/pkgs/misc/tex/nix/dot2pdf.sh b/pkgs/misc/tex/nix/dot2pdf.sh index 0a9610c00ff21..c416bf235a14a 100644 --- a/pkgs/misc/tex/nix/dot2pdf.sh +++ b/pkgs/misc/tex/nix/dot2pdf.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out dot2pdf() { sourceFile=$1 diff --git a/pkgs/misc/tex/nix/dot2ps.sh b/pkgs/misc/tex/nix/dot2ps.sh index 1269108d6f521..c70e76ce4c734 100644 --- a/pkgs/misc/tex/nix/dot2ps.sh +++ b/pkgs/misc/tex/nix/dot2ps.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out dot2ps() { sourceFile=$1 diff --git a/pkgs/misc/tex/nix/lhs2tex.sh b/pkgs/misc/tex/nix/lhs2tex.sh index 6edca4baf8a02..f34b3944c8ef1 100644 --- a/pkgs/misc/tex/nix/lhs2tex.sh +++ b/pkgs/misc/tex/nix/lhs2tex.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out +mkdir -p $out mkdir root cd root diff --git a/pkgs/misc/tex/nix/run-latex.sh b/pkgs/misc/tex/nix/run-latex.sh index 6c18721eed6ba..2886057c8945c 100644 --- a/pkgs/misc/tex/nix/run-latex.sh +++ b/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 diff --git a/pkgs/misc/tex/pgf/1.x.nix b/pkgs/misc/tex/pgf/1.x.nix index 672ae6fdfce4d..91948f995a0e2 100644 --- a/pkgs/misc/tex/pgf/1.x.nix +++ b/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 "; } diff --git a/pkgs/misc/tex/pgf/2.x.nix b/pkgs/misc/tex/pgf/2.x.nix index 5e73d12959c6d..09ec1729cfd47 100644 --- a/pkgs/misc/tex/pgf/2.x.nix +++ b/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 "; } diff --git a/pkgs/misc/tex/polytable/builder.sh b/pkgs/misc/tex/polytable/builder.sh index 1138b8e67896d..68f653ccec05b 100644 --- a/pkgs/misc/tex/polytable/builder.sh +++ b/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" } diff --git a/pkgs/misc/tex/tetex/default.nix b/pkgs/misc/tex/tetex/default.nix index 5e0fb38c3bd50..bb1e3f8b4b037 100644 --- a/pkgs/misc/tex/tetex/default.nix +++ b/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 -) ''; diff --git a/pkgs/misc/tex/tex4ht/default.nix b/pkgs/misc/tex/tex4ht/default.nix index 90d134fcd4e7f..5d5d85d3c1d95 100644 --- a/pkgs/misc/tex/tex4ht/default.nix +++ b/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/. ''; diff --git a/pkgs/misc/tex/texlive/aggregate.nix b/pkgs/misc/tex/texlive/aggregate.nix index 1723f48190625..c018d2da0d3d9 100644 --- a/pkgs/misc/tex/texlive/aggregate.nix +++ b/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 diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/misc/tex/texlive/beamer.nix index 5ff2c89316a10..851ad0707a1da 100644 --- a/pkgs/misc/tex/texlive/beamer.nix +++ b/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/ diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix index 4f15afdc38141..e23b393685071 100644 --- a/pkgs/misc/tex/texlive/cm-super.nix +++ b/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/ diff --git a/pkgs/misc/tex/texlive/context.nix b/pkgs/misc/tex/texlive/context.nix index b502b0f2108aa..a7161cea4c1bc 100644 --- a/pkgs/misc/tex/texlive/context.nix +++ b/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/ diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix index 69fb5d7e415f2..30e59849d32fa 100644 --- a/pkgs/misc/tex/texlive/default.nix +++ b/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* diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix index 598bdd08aef5d..1ecec91a68565 100644 --- a/pkgs/misc/tex/texlive/extra.nix +++ b/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"]; diff --git a/pkgs/misc/tex/texlive/moderncv.nix b/pkgs/misc/tex/texlive/moderncv.nix index a19835eda4bb4..bbff2ccf4a1f8 100644 --- a/pkgs/misc/tex/texlive/moderncv.nix +++ b/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/ diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix index fac520290f003..61e2eb26c68ae 100644 --- a/pkgs/misc/tex/texlive/pgf.nix +++ b/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"]; diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/misc/tex/texlive/xcolor.nix index 4e8d5eeb30b39..e59a58ce9b26c 100644 --- a/pkgs/misc/tex/texlive/xcolor.nix +++ b/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/ diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 0ad55339d08fc..7525c28e740e6 100644 --- a/pkgs/misc/uboot/default.nix +++ b/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 ''; diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix index b78424acfaede..0e63a56073b6b 100644 --- a/pkgs/misc/uboot/guruplug.nix +++ b/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 ''; } diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix index c45eb3f1d24ff..b8261979ec0c0 100644 --- a/pkgs/misc/uboot/nanonote.nix +++ b/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 ''; } diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix index 83d029d415460..5eb8d7d7bf876 100644 --- a/pkgs/misc/uboot/sheevaplug.nix +++ b/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 ''; } diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index 48ab97d910644..cfb71690ad5d9 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -7,5 +7,5 @@ stdenv.mkDerivation { sha256 = "1m5nfzgwaglqabpm2l2mjqvigz1z0dj87cmj2pjbbzxmmpapv0lq"; }; buildPhase = "rm *.o 915resolution; make"; - installPhase = "ensureDir $out/sbin; cp 915resolution $out/sbin/"; + installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; } diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index 1a9b3cbf74dc9..925e2e2e65019 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation { installPhase = '' kernelVersion=$(cd ${kernel}/lib/modules && ls) - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp acpi_call.ko $out/lib/modules/$kernelVersion/misc - ensureDir $out/bin + mkdir -p $out/bin cp test_off.sh $out/bin/test_discrete_video_off.sh ''; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 1fd6234b48e2b..b05093d891575 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -136,7 +136,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" { # install - ensureDir $out/lib/xorg + mkdir -p $out/lib/xorg cp -r common/usr/include $out cp -r common/usr/sbin $out @@ -152,7 +152,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg t=$out/lib/modules/${kernelVersion}/kernel/drivers/misc - ensureDir $t + mkdir -p $t cp ./common/lib/modules/fglrx/build_mod/2.6.x/fglrx.ko $t @@ -174,7 +174,7 @@ GCC_MAJOR="`gcc --version | grep -o -e ") ." | head -1 | cut -d " " -f 2`" } { # build samples - ensureDir $out/bin + mkdir -p $out/bin mkdir -p samples cd samples diff --git a/pkgs/os-specific/linux/aufs/2.1.nix b/pkgs/os-specific/linux/aufs/2.1.nix index f6a3a6dffc262..1539775a2a17d 100644 --- a/pkgs/os-specific/linux/aufs/2.1.nix +++ b/pkgs/os-specific/linux/aufs/2.1.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.version}/misc cp -v aufs.ko $out/lib/modules/${kernel.version}/misc # Install the headers because aufs2.1-util requires them. diff --git a/pkgs/os-specific/linux/aufs/2.nix b/pkgs/os-specific/linux/aufs/2.nix index 696ed57b86036..4d80ddae0b871 100644 --- a/pkgs/os-specific/linux/aufs/2.nix +++ b/pkgs/os-specific/linux/aufs/2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.version}/misc + mkdir -p $out/lib/modules/${kernel.version}/misc cp aufs.ko $out/lib/modules/${kernel.version}/misc # Install the headers because aufs2-util requires them. diff --git a/pkgs/os-specific/linux/aufs/3.nix b/pkgs/os-specific/linux/aufs/3.nix index ec3c5aec85ba9..731098134b585 100644 --- a/pkgs/os-specific/linux/aufs/3.nix +++ b/pkgs/os-specific/linux/aufs/3.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/lib/modules/${kernel.modDirVersion}/misc + mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc cp -v aufs.ko $out/lib/modules/${kernel.modDirVersion}/misc # Install the headers because aufs3-util requires them. - ensureDir $out/include/linux + mkdir -p $out/include/linux cp -v usr/include/linux/aufs_type.h $out/include/linux ''; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index 9749b1568e460..39cc2dd40800c 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { '' binDir="$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/" docDir="$out/share/doc/broadcom-sta/" - ensureDir "$binDir" "$docDir" + mkdir -p "$binDir" "$docDir" cp wl.ko "$binDir" cp lib/LICENSE.txt "$docDir" ''; diff --git a/pkgs/os-specific/linux/cramfsswap/builder.sh b/pkgs/os-specific/linux/cramfsswap/builder.sh index 14e6a11f9d053..51a5b11dda699 100644 --- a/pkgs/os-specific/linux/cramfsswap/builder.sh +++ b/pkgs/os-specific/linux/cramfsswap/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup export DESTDIR=$out -ensureDir $out/usr/bin +mkdir -p $out/usr/bin genericBuild diff --git a/pkgs/os-specific/linux/exmap/default.nix b/pkgs/os-specific/linux/exmap/default.nix index da5e00e337724..a7fb22f95e98d 100644 --- a/pkgs/os-specific/linux/exmap/default.nix +++ b/pkgs/os-specific/linux/exmap/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { #checkPhase = "make test" installPhase = '' - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp kernel/*.ko "$out/share/${name}" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp src/{gexmap,exmtool,elftool,showproc} "$out/bin" ''; diff --git a/pkgs/os-specific/linux/ext3cow-tools/builder.sh b/pkgs/os-specific/linux/ext3cow-tools/builder.sh index 560b8d6723ab2..be6e3d9ce3ad5 100755 --- a/pkgs/os-specific/linux/ext3cow-tools/builder.sh +++ b/pkgs/os-specific/linux/ext3cow-tools/builder.sh @@ -13,7 +13,7 @@ sed -i "s/linux\/ext3cow_fs.h/$kernerlext3cowheader_slashed/" ext3cow_tools.h # make -ensureDir $out/bin/ +mkdir -p $out/bin/ cp ss $out/bin/snapshot cp tt $out/bin/ cp e2d $out/bin/ diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix index 6ad2227ee69e1..f468b183be956 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { patchPhase = "rm -rf debian defines TODO"; - installPhase = "ensureDir $out && cp -ra * $out/"; + installPhase = "mkdir -p $out && cp -ra * $out/"; # repeat the same trick for radeon, 3com, etc. postInstall = "ln -s $out/realtek/rtlwifi $out/rtlwifi"; diff --git a/pkgs/os-specific/linux/firmware/ipw2100/default.nix b/pkgs/os-specific/linux/firmware/ipw2100/default.nix index 2ffa8c3e83757..3548a841aab0a 100644 --- a/pkgs/os-specific/linux/firmware/ipw2100/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2100/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out; cp * $out"; + installPhase = "mkdir -p $out; cp * $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/ipw2200/default.nix b/pkgs/os-specific/linux/firmware/ipw2200/default.nix index ed6a82e0df7bc..402636862ecab 100644 --- a/pkgs/os-specific/linux/firmware/ipw2200/default.nix +++ b/pkgs/os-specific/linux/firmware/ipw2200/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out; cp * $out"; + installPhase = "mkdir -p $out; cp * $out"; meta = { # "... you may transfer a copy of the Software ... provided such diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix index c09bd5c5aca91..2660c0b2493dc 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-1000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix index 389d416f2a5df..afe2357995c2b 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-3945-ucode/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; - installPhase = "ensureDir $out; chmod -x *; cp * $out"; + installPhase = "mkdir -p $out; chmod -x *; cp * $out"; meta = { description = "Firmware for the Intel 3945ABG wireless card"; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix index b75eae6acf217..3e3ad74adb346 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix index 0948d381f7f15..e1771c7a5cfb6 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix index 8dc69e0a6a3c2..b8ee5f388d194 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix index 0505a940d2637..0d409bd8427cf 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-5150-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix index 5b7e2dc7b5e40..e5f3effa4b736 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix index 80aa6d367be75..e5fe73ca4984b 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2a-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix index 580af83ea9def..b3a2a810bf7d3 100644 --- a/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix +++ b/pkgs/os-specific/linux/firmware/iwlwifi-6000g2b-ucode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; installPhase = '' - ensureDir "$out" + mkdir -p "$out" chmod -x * cp * "$out" ''; diff --git a/pkgs/os-specific/linux/firmware/ralink/default.nix b/pkgs/os-specific/linux/firmware/ralink/default.nix index 23513d2bf8854..abf12fd672b71 100644 --- a/pkgs/os-specific/linux/firmware/ralink/default.nix +++ b/pkgs/os-specific/linux/firmware/ralink/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." installPhase = '' - ensureDir $out + mkdir -p $out cp $src/*.bin $out cp $src/LICENSE $out/ralink.LICENSE ''; diff --git a/pkgs/os-specific/linux/firmware/rt2860/default.nix b/pkgs/os-specific/linux/firmware/rt2860/default.nix index 0c8accd2f6c5c..0a1cb6555726b 100644 --- a/pkgs/os-specific/linux/firmware/rt2860/default.nix +++ b/pkgs/os-specific/linux/firmware/rt2860/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." installPhase = '' - ensureDir $out + mkdir -p $out cp $src/rt2860.bin $out cp $src/LICENSE $out/rt2860.LICENSE ''; diff --git a/pkgs/os-specific/linux/firmware/rt2870/default.nix b/pkgs/os-specific/linux/firmware/rt2870/default.nix index 388d3a5034366..15de7c30586b4 100644 --- a/pkgs/os-specific/linux/firmware/rt2870/default.nix +++ b/pkgs/os-specific/linux/firmware/rt2870/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; + installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; meta = { description = "Firmware for the Ralink RT2870 wireless cards"; diff --git a/pkgs/os-specific/linux/firmware/rt73/default.nix b/pkgs/os-specific/linux/firmware/rt73/default.nix index 32c097a62df9e..9539310013940 100644 --- a/pkgs/os-specific/linux/firmware/rt73/default.nix +++ b/pkgs/os-specific/linux/firmware/rt73/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # says: "Your rights to redistribute the Software shall be # contingent upon your installation of this Agreement in its # entirety in the same directory as the Software." - installPhase = "ensureDir $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; + installPhase = "mkdir -p $out/${name}; cp *.bin $out; cp *.txt $out/${name}"; meta = { description = "Firmware for the Ralink RT73 wireless card"; diff --git a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix index 85bbb27c67f0b..7016e23581b7a 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192c/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192c/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { src = firmwareLinuxNonfree; phases = [ "installPhase" ]; - installPhase = "ensureDir $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; + installPhase = "mkdir -p $out/rtlwifi && cp $src/realtek/rtlwifi/rtl8192cfw.bin $out/rtlwifi/rtl8192cfw.bin"; meta = { description = "Firmware for the Realtek RTL8192c wireless cards"; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index dfc384b7adb62..a717bd9e1171b 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildPhase = "true"; - installPhase = "ensureDir $out/zd1211; cp * $out/zd1211"; + installPhase = "mkdir -p $out/zd1211; cp * $out/zd1211"; meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 455c11cb0a979..d21cdd78daf14 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -22,9 +22,9 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/sbin - ensureDir $out/share/man/man8 - ensureDir $out/share/usb + mkdir -p $out/sbin + mkdir -p $out/share/man/man8 + mkdir -p $out/share/usb ''; meta = { diff --git a/pkgs/os-specific/linux/kernel-headers/2.4.nix b/pkgs/os-specific/linux/kernel-headers/2.4.nix index c179801ca5531..32daf5633f79e 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.4.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.4.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/include + mkdir -p $out/include cp -a include/{asm,asm-$platform,acpi,linux,pcmcia,scsi,video} \ $out/include ''; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index 98a06556a1945..920ccf9363d85 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix index a4e8665819323..a7ec522b3d661 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.32.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.32.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index c0f949186c60d..f5fec3d8620c0 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { make INSTALL_HDR_PATH=$out headers_install # Some builds (e.g. KVM) want a kernel.release. - ensureDir $out/include/config + mkdir -p $out/include/config echo "${version}-default" > $out/include/config/kernel.release ''; diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh index 61cb8f2808102..5d6d48d2fc3d6 100644 --- a/pkgs/os-specific/linux/kernel/builder.sh +++ b/pkgs/os-specific/linux/kernel/builder.sh @@ -48,7 +48,7 @@ configurePhase() { installPhase() { - ensureDir $out + mkdir -p $out # New kernel versions have a combined tree for i386 and x86_64. archDir=$arch @@ -60,7 +60,7 @@ installPhase() { # Copy the bzImage and System.map. cp System.map $out if test "$arch" = um; then - ensureDir $out/bin + mkdir -p $out/bin cp linux $out/bin elif test "$kernelTarget" != "vmlinux"; then # In any case we copy the 'vmlinux' ELF in the next lines diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix index ff72d1f72b845..066b4fcb4e063 100644 --- a/pkgs/os-specific/linux/klibc/shrunk.nix +++ b/pkgs/os-specific/linux/klibc/shrunk.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { #name = "${klibc.name}-shrunk"; name = "${klibc.name}"; buildCommand = '' - ensureDir $out/lib + mkdir -p $out/lib cp -prd ${klibc}/lib/klibc/bin $out/ cp -p ${klibc}/lib/*.so $out/lib/ chmod +w $out/* diff --git a/pkgs/os-specific/linux/kudzu/builder.sh b/pkgs/os-specific/linux/kudzu/builder.sh index 744d1d516a332..002bac8a1db85 100644 --- a/pkgs/os-specific/linux/kudzu/builder.sh +++ b/pkgs/os-specific/linux/kudzu/builder.sh @@ -3,10 +3,10 @@ source $stdenv/setup export DESTDIR=$out preInstall() { - ensureDir $out - ensureDir $out/etc - ensureDir $out/sbin - ensureDir $out/usr + mkdir -p $out + mkdir -p $out/etc + mkdir -p $out/sbin + mkdir -p $out/usr make install-program } diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index d8cb393ac38be..c279393d7a407 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { passthru = { postinst = n : '' - ensureDir $out/share/doc/${n} + mkdir -p $out/share/doc/${n} cp ../License $out/share/doc/${n}/License ''; }; diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 09cd4ab037c91..700455d5f8b95 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preBuild = '' - ensureDir $out/bin + mkdir -p $out/bin substituteInPlace Makefile --replace /usr/bin $out/bin substituteInPlace lsiutil.c \ --replace /sbin/modprobe modprobe \ diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index b27baa5480b90..192e2c7ac5f96 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; preInstall = '' - ensureDir $out/sbin $out/share/man/man8 + mkdir -p $out/sbin $out/share/man/man8 makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8) ''; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index 34de51081648d..7c8b526b4c378 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace '/usr$(libdir)' $TMPDIR \ --replace 'install-data-local:' 'install-data-local-disabled:' - ensureDir $out/etc + mkdir -p $out/etc ''; buildInputs = [openldap]; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index f329db90cb20a..b92408058657e 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preInstall = '' # The `install' rule expects this directory to be available. - ensureDir "$out/share/man/man5" + mkdir -p "$out/share/man/man5" ''; meta = { diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh index 6941288b3903f..e0af21759c9d7 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy.sh @@ -36,7 +36,7 @@ buildPhase() { installPhase() { # Install libGL and friends. - ensureDir $out/lib + mkdir -p $out/lib cp -prd usr/lib/* usr/X11R6/lib/libXv* $out/lib/ ln -snf libGLcore.so.$versionNumber $out/lib/libGLcore.so @@ -59,11 +59,11 @@ installPhase() { if test -z "$libsOnly"; then # Install the kernel module. - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp usr/src/nv/nvidia.ko $out/lib/modules/$kernelVersion/misc # Install the X driver. - ensureDir $out/lib/xorg/modules + mkdir -p $out/lib/xorg/modules cp -prd usr/X11R6/lib/modules/* $out/lib/xorg/modules/ ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 @@ -72,7 +72,7 @@ installPhase() { patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* # Install the programs. - ensureDir $out/bin + mkdir -p $out/bin for i in nvidia-settings nvidia-xconfig; do cp usr/bin/$i $out/bin/$i diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 180eb84e5e4f0..b0d2bf35c52a8 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -27,7 +27,7 @@ buildPhase() { installPhase() { # Install libGL and friends. - ensureDir $out/lib + mkdir -p $out/lib cp -prd libcuda.* libGL.* libnvidia-cfg.* libnvidia-compiler.* libnvidia-tls.* libnvidia-glcore.* libOpenCL.* libXv* libvdpau_nvidia* tls $out/lib/ ln -snf libnvidia-glcore.so.$versionNumber $out/lib/libnvidia-glcore.so @@ -50,15 +50,15 @@ installPhase() { if test -z "$libsOnly"; then # Install the kernel module. - ensureDir $out/lib/modules/$kernelVersion/misc + mkdir -p $out/lib/modules/$kernelVersion/misc cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc # Install the X driver. - ensureDir $out/lib/xorg/modules + mkdir -p $out/lib/xorg/modules cp -p libnvidia-wfb.* $out/lib/xorg/modules/ - ensureDir $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/drivers cp -p nvidia_drv.so $out/lib/xorg/modules/drivers - ensureDir $out/lib/xorg/modules/extensions + mkdir -p $out/lib/xorg/modules/extensions cp -p libglx.so.* $out/lib/xorg/modules/extensions ln -snf libnvidia-wfb.so.$versionNumber $out/lib/xorg/modules/libnvidia-wfb.so.1 @@ -67,7 +67,7 @@ installPhase() { patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* # Install the programs. - ensureDir $out/bin + mkdir -p $out/bin for i in nvidia-settings nvidia-xconfig; do cp $i $out/bin/$i @@ -76,16 +76,16 @@ installPhase() { done # Header files etc. - ensureDir $out/include/nvidia + mkdir -p $out/include/nvidia cp -p *.h $out/include/nvidia - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp -p *.1.gz $out/share/man/man1 - ensureDir $out/share/applications + mkdir -p $out/share/applications cp -p *.desktop $out/share/applications - ensureDir $out/share/pixmaps + mkdir -p $out/share/pixmaps cp -p nvidia-settings.png $out/share/pixmaps # Patch the `nvidia-settings.desktop' file. diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh index 7ab20855bd315..cd21899e60e7d 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh +++ b/pkgs/os-specific/linux/opengl/xorg-sys/builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/lib +mkdir -p $out/lib ln -s /usr/lib/libGL.so.1 $out/lib/ ln -s /usr/lib/libGLU.so.1 $out/lib/ diff --git a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh index 8bb282cacf757..21a2ac725ca7c 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh +++ b/pkgs/os-specific/linux/ov511/ov511-2.30-builder.sh @@ -13,6 +13,6 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/kernel/drivers/usb/media/ +mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ genericBuild diff --git a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh b/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh index c189c2e17068a..636b19a95af22 100644 --- a/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh +++ b/pkgs/os-specific/linux/ov511/ov511-2.32-builder.sh @@ -13,7 +13,7 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/kernel/drivers/usb/media/ +mkdir -p $out/lib/modules/$version/kernel/drivers/usb/media/ genericBuild diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index a8b885d8a9447..b53c61c754ae2 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { lib.concatMapStrings (path: '' for f in : $(find ${path} -type f); do test "$f" == ":" && continue; - ensureDir $(dirname $out/lib/firmware/$\{f#${path}}); + mkdir -p $(dirname $out/lib/firmware/$\{f#${path}}); ln -s $f $out/lib/firmware/$\{f#${path}}; done; '') firmware; diff --git a/pkgs/os-specific/linux/qc-usb/builder.sh b/pkgs/os-specific/linux/qc-usb/builder.sh index a43138fa84fea..041be11532856 100644 --- a/pkgs/os-specific/linux/qc-usb/builder.sh +++ b/pkgs/os-specific/linux/qc-usb/builder.sh @@ -13,7 +13,7 @@ echo "version $version" export version -ensureDir $out/lib/modules/$version/misc +mkdir -p $out/lib/modules/$version/misc LINUX_DIR=$kernel/lib/modules/$version/build PREFIX=$out diff --git a/pkgs/os-specific/linux/radeontools/default.nix b/pkgs/os-specific/linux/radeontools/default.nix index ff3cad3fe98fd..4dbe7e54247a0 100644 --- a/pkgs/os-specific/linux/radeontools/default.nix +++ b/pkgs/os-specific/linux/radeontools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin chmod +x lightwatch.pl cp radeontool lightwatch.pl $out/bin ''; diff --git a/pkgs/os-specific/linux/sysklogd/builder.sh b/pkgs/os-specific/linux/sysklogd/builder.sh index 62df45ea7c95f..d466f075652c0 100644 --- a/pkgs/os-specific/linux/sysklogd/builder.sh +++ b/pkgs/os-specific/linux/sysklogd/builder.sh @@ -6,8 +6,8 @@ export prefix installFlags="BINDIR=$out/sbin MANDIR=$out/share/man INSTALL=install" patchPhase="sed -e 's@-o \${MAN_USER} -g \${MAN_GROUP} -m \${MAN_PERMS} @@' -i Makefile" -ensureDir "$out/share/man/man8/" -ensureDir "$out/share/man/man5/" -ensureDir "$out/sbin" +mkdir -p "$out/share/man/man8/" +mkdir -p "$out/share/man/man5/" +mkdir -p "$out/sbin" genericBuild diff --git a/pkgs/os-specific/linux/tcp-wrapper/builder.sh b/pkgs/os-specific/linux/tcp-wrapper/builder.sh index 58bc1d4409d13..7ea574fcf2327 100644 --- a/pkgs/os-specific/linux/tcp-wrapper/builder.sh +++ b/pkgs/os-specific/linux/tcp-wrapper/builder.sh @@ -22,18 +22,18 @@ echo "building..." make REAL_DAEMON_DIR="$out/sbin" linux # Install -ensureDir "$out/sbin" +mkdir -p "$out/sbin" cp -v safe_finger tcpd tcpdchk tcpdmatch try-from "$out/sbin" -ensureDir "$out/lib" +mkdir -p "$out/lib" cp -v shared/lib*.so* "$out/lib" -ensureDir "$out/include" +mkdir -p "$out/include" cp -v *.h "$out/include" -ensureDir "$out/man" +mkdir -p "$out/man" for i in 3 5 8; do - ensureDir "$out/man/man$i" + mkdir -p "$out/man/man$i" cp *.$i "$out/man/man$i" ; done diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index f4c3aad938f2c..8ea3599ff1984 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { makeFlags = [ "tunctl" ]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp tunctl $out/bin ''; diff --git a/pkgs/os-specific/linux/upstart/default.nix b/pkgs/os-specific/linux/upstart/default.nix index 4e440770ef98c..3c5fb2283cda2 100644 --- a/pkgs/os-specific/linux/upstart/default.nix +++ b/pkgs/os-specific/linux/upstart/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' t=$out/etc/bash_completion.d - ensureDir $t + mkdir -p $t cp ${./upstart-bash-completion} $t/upstart ''; diff --git a/pkgs/os-specific/linux/wis-go7007/default.nix b/pkgs/os-specific/linux/wis-go7007/default.nix index 73e5694572af9..4fff3ed37c0c1 100644 --- a/pkgs/os-specific/linux/wis-go7007/default.nix +++ b/pkgs/os-specific/linux/wis-go7007/default.nix @@ -61,9 +61,9 @@ stdenv.mkDerivation { substituteInPlace Makefile \ --replace '$(DESTDIR)$(KSRC)/include/linux' $includeDir \ --replace '$(DESTDIR)$(FIRMWARE_DIR)' '$(FIRMWARE_DIR)' - ensureDir $includeDir - ensureDir $out/etc/hotplug/usb - ensureDir $out/etc/udev/rules.d + mkdir -p $includeDir + mkdir -p $out/etc/hotplug/usb + mkdir -p $out/etc/udev/rules.d makeFlagsArray=(KERNELSRC=$kernelSource \ FIRMWARE_DIR=$out/firmware FXLOAD=${fxload}/sbin/fxload \ @@ -72,7 +72,7 @@ stdenv.mkDerivation { ''; # */ postInstall = '' - ensureDir $out/bin + mkdir -p $out/bin cp apps/gorecord apps/modet $out/bin/ ''; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index fcb6641dfd99c..a0e426e482bd1 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -35,10 +35,10 @@ in }) ]; postInstall = '' - ensureDir $out/share/man/man5 $out/share/man/man8 + mkdir -p $out/share/man/man5 $out/share/man/man8 cp -v doc/docbook/*.5 $out/share/man/man5/ cp -v doc/docbook/*.8 $out/share/man/man8/ - ensureDir $out/etc/dbus-1/system.d $out/share/dbus-1/system-services + mkdir -p $out/etc/dbus-1/system.d $out/share/dbus-1/system-services cp -v dbus/*service $out/share/dbus-1/system-services sed -e "s@/sbin/wpa_supplicant@$out&@" -i $out/share/dbus-1/system-services/* cp -v dbus/dbus-wpa_supplicant.conf $out/etc/dbus-1/system.d diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix index f04297096d2f8..c5cc5f3b68f0c 100644 --- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix +++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { installPhase = '' make DESTDIR="$out" LIBDIR="lib" install - ensureDir $out/include/xorg + mkdir -p $out/include/xorg echo -n "$confFile" > $out/include/xorg/10-multitouch.conf ''; diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 9cc25174c51fb..98446c708671c 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ncurses pkgconfig randrproto xorgserver xproto udev ]; preConfigure = '' - ensureDir $out/share/X11/xorg.conf.d + mkdir -p $out/share/X11/xorg.conf.d configureFlags="--with-xorg-module-dir=$out/lib/xorg/modules --with-sdkdir=$out/include/xorg --with-xorg-conf-dir=$out/share/X11/xorg.conf.d" ''; diff --git a/pkgs/os-specific/windows/mingw-headers/default.nix b/pkgs/os-specific/windows/mingw-headers/default.nix index c4e0063feecb8..c6941ef01f0a7 100644 --- a/pkgs/os-specific/windows/mingw-headers/default.nix +++ b/pkgs/os-specific/windows/mingw-headers/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { phases = [ "installPhase" ]; installPhase = '' - ensureDir $out/include + mkdir -p $out/include cp -R ${mingw_runtime_headers}/include/* $out/include cp -R ${w32api_headers}/include/* $out/include ''; diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix index aecf43c9123b8..434c439cd78ee 100644 --- a/pkgs/os-specific/windows/mingwrt/default.nix +++ b/pkgs/os-specific/windows/mingwrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (rec { name = name + "-headers"; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - ensureDir $out + mkdir -p $out cp -R include $out ''; } else { diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix index 570b83f671e5d..56ab80c72355c 100644 --- a/pkgs/os-specific/windows/w32api/default.nix +++ b/pkgs/os-specific/windows/w32api/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation ({ name = name + "-headers"; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' - ensureDir $out + mkdir -p $out cp -R include $out ''; } else { diff --git a/pkgs/servers/dict/dictd-db-collector.nix b/pkgs/servers/dict/dictd-db-collector.nix index 299bfc8ac2f75..f635c98602d96 100644 --- a/pkgs/servers/dict/dictd-db-collector.nix +++ b/pkgs/servers/dict/dictd-db-collector.nix @@ -25,7 +25,7 @@ let } "; installPhase = '' - ensureDir $out/share/dictd + mkdir -p $out/share/dictd cd $out/share/dictd echo "${databases}" >databases.names echo "${accessSection}" > dictd.conf diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 553b371d24c3a..c6c0bc73a08a3 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -5,7 +5,7 @@ with builderDefs; let localDefs = builderDefs.passthru.function (rec { src=_src; doInstall = fullDepEntry ('' - ensureDir $out/share/dictd + mkdir -p $out/share/dictd tar xf ${src} cp $(ls ./${_subdir}/*.{dict*,index} || true) $out/share/dictd echo "${_locale}" >$out/share/dictd/locale diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index c600573ba86e2..aa40365e8deaf 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { '' tar xfvz $src cd felix-framework-* - ensureDir $out + mkdir -p $out cp -av * $out ''; meta = { diff --git a/pkgs/servers/felix/remoteshell.nix b/pkgs/servers/felix/remoteshell.nix index 4d6a8d8318f7e..6e8089d32e977 100644 --- a/pkgs/servers/felix/remoteshell.nix +++ b/pkgs/servers/felix/remoteshell.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildCommand = '' - ensureDir $out/bundle + mkdir -p $out/bundle cp ${src} $out/bundle/org.apache.felix.shell.remote-1.0.4.jar ''; } diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix index 5e5d91fa82051..2fab0fd9910cc 100644 --- a/pkgs/servers/fingerd/bsd-fingerd/default.nix +++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { preBuild = "cd fingerd"; - preInstall = '' ensureDir $out/man/man8 $out/sbin ''; + preInstall = '' mkdir -p $out/man/man8 $out/sbin ''; } diff --git a/pkgs/servers/games/ghost-one/default.nix b/pkgs/servers/games/ghost-one/default.nix index 2fd9a45dfc0ec..f90b5e4099734 100644 --- a/pkgs/servers/games/ghost-one/default.nix +++ b/pkgs/servers/games/ghost-one/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make cd ../../../StormLib/stormlib/ make - ensureDir $out/lib + mkdir -p $out/lib cd ../.. # cp bncsutil/src/bncsutil/libbncutil.so $out/lib # cp StormLib/stormlib/libStorm.so $out/lib @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/lib + mkdir -p $out/lib cp bncsutil/src/bncsutil/libbncsutil.so $out/lib cp StormLib/stormlib/libStorm.so $out/lib - ensureDir $out/bin + mkdir -p $out/bin cp ghost/ghost++ $out/bin - ensureDir $out/share/ghost-one/languages + mkdir -p $out/share/ghost-one/languages cp -r mapcfgs $out/share/ghost-one cp Languages/*.cfg $out/share/ghost-one/languages cp language.cfg $out/share/ghost-one/languages/English.cfg diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index a59fa60c4c7b0..b36327ff5205e 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { preInstall = '' installFlags="LIBEXECDIR=$out/modules $installFlags" - ensureDir $out/modules + mkdir -p $out/modules ''; passthru = { inherit apacheHttpd; }; diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh b/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh index 70b609e64656a..52efe537c9bda 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/builder.sh @@ -4,5 +4,5 @@ tar xfvz $src cd tomcat-connectors-*-src/native ./configure --with-apxs=$apacheHttpd/bin/apxs --with-java-home=$jdk make -ensureDir $out/modules +mkdir -p $out/modules cp apache-2.0/mod_jk.so $out/modules diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 41eff4cf967f1..2f0b9be96b04d 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -av * $out ''; diff --git a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh b/pkgs/servers/http/jboss/jdbc/mysql/builder.sh index 06d60fc5e126b..6af39a0cb6338 100644 --- a/pkgs/servers/http/jboss/jdbc/mysql/builder.sh +++ b/pkgs/servers/http/jboss/jdbc/mysql/builder.sh @@ -1,5 +1,5 @@ buildInputs="$mysql_jdbc" source $stdenv/setup -ensureDir $out/server/default/lib +mkdir -p $out/server/default/lib ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/server/default/lib/mysql-connector-java.jar diff --git a/pkgs/servers/http/jetty/6.1/bin-builder.sh b/pkgs/servers/http/jetty/6.1/bin-builder.sh index d19f42eb45cdd..bec0663bee78c 100644 --- a/pkgs/servers/http/jetty/6.1/bin-builder.sh +++ b/pkgs/servers/http/jetty/6.1/bin-builder.sh @@ -3,5 +3,5 @@ set -e source $stdenv/setup unzip $src -ensureDir $out/$name +mkdir -p $out/$name mv jetty*/* $out/$name diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index 0a83dd09601f5..1a7e6f6d16c24 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -72,12 +72,12 @@ rec { mv lib/slf4j-simple-*.jar lib/obsolete - ensureDir "$out/share" + mkdir -p "$out/share" TARGET="$out/share/${name}-dist" cp -r . "$TARGET" ln -s "$TARGET/lib" "$out/lib" chmod a+x "$TARGET/bin/"* - ensureDir "$out/bin" + mkdir -p "$out/bin" echo -e '#! /bin/sh\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands" echo '#! /bin/sh' >> "$out/bin/jena-command" diff --git a/pkgs/servers/http/tomcat/axis2/builder.sh b/pkgs/servers/http/tomcat/axis2/builder.sh index 91d300822a770..2e36367e9dcf5 100644 --- a/pkgs/servers/http/tomcat/axis2/builder.sh +++ b/pkgs/servers/http/tomcat/axis2/builder.sh @@ -2,12 +2,12 @@ source $stdenv/setup unzip $src cd axis2-* -ensureDir $out +mkdir -p $out cp -av * $out cd webapp ant cd .. -ensureDir $out/webapps +mkdir -p $out/webapps cp dist/axis2.war $out/webapps cd $out/webapps mkdir axis2 diff --git a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh index 4a7248dfc8d50..14829c5e85d81 100644 --- a/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh +++ b/pkgs/servers/http/tomcat/jdbc/mysql/builder.sh @@ -1,4 +1,4 @@ source $stdenv/setup -ensureDir $out/lib +mkdir -p $out/lib ln -s $mysql_jdbc/share/java/mysql-connector-java.jar $out/lib/mysql-connector-java.jar diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 0fa2bf821a4e8..16d9127e5561c 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; postInstall = '' - ensureDir $out + mkdir -p $out mv ut/$out/* $out/ mkdir $out/share/postfix/conf diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index 41e617d80b6bf..df3fea05f7722 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -33,11 +33,11 @@ in postInstall = '' - ensureDir $out/share/zabbix + mkdir -p $out/share/zabbix cp -prvd frontends/php $out/share/zabbix/php - ensureDir $out/share/zabbix/db/data + mkdir -p $out/share/zabbix/db/data cp -prvd create/data/*.sql $out/share/zabbix/db/data - ensureDir $out/share/zabbix/db/schema + mkdir -p $out/share/zabbix/db/schema cp -prvd create/schema/*.sql $out/share/zabbix/db/schema ''; diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix index 9d8a641b4a8a4..aaa9bb684f4e9 100644 --- a/pkgs/servers/portmap/default.nix +++ b/pkgs/servers/portmap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcpWrapper ]; installPhase = '' - ensureDir "$out/sbin" && ensureDir "$out/man/man8" && \ + mkdir -p "$out/sbin" && ensureDir "$out/man/man8" && \ make install BASEDIR=$out ''; diff --git a/pkgs/servers/sql/mysql/jdbc/builder.sh b/pkgs/servers/sql/mysql/jdbc/builder.sh index 29ecbc1aebe3d..56336e041356f 100644 --- a/pkgs/servers/sql/mysql/jdbc/builder.sh +++ b/pkgs/servers/sql/mysql/jdbc/builder.sh @@ -5,5 +5,5 @@ set -e unzip $src cd mysql-connector-java-* -ensureDir $out/share/java +mkdir -p $out/share/java cp mysql-connector-java-*-bin.jar $out/share/java/mysql-connector-java.jar diff --git a/pkgs/servers/sql/postgresql/jdbc/builder.sh b/pkgs/servers/sql/postgresql/jdbc/builder.sh index 318a4e637a0e8..2fccb68662901 100755 --- a/pkgs/servers/sql/postgresql/jdbc/builder.sh +++ b/pkgs/servers/sql/postgresql/jdbc/builder.sh @@ -6,5 +6,5 @@ tar zxvf $src cd postgresql-jdbc-* ant -ensureDir $out/share/java +mkdir -p $out/share/java cp jars/*.jar $out/share/java diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh index c33d1806fd602..bb776a5051bd0 100644 --- a/pkgs/servers/x11/xorg/builder.sh +++ b/pkgs/servers/x11/xorg/builder.sh @@ -32,7 +32,7 @@ postInstall() { fi done - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" } diff --git a/pkgs/servers/x11/xorg/imake.sh b/pkgs/servers/x11/xorg/imake.sh index 131ce0e832ca8..4ab5e2ae160ba 100644 --- a/pkgs/servers/x11/xorg/imake.sh +++ b/pkgs/servers/x11/xorg/imake.sh @@ -1,5 +1,5 @@ preInstall() { - ensureDir $out/lib/X11/config + mkdir -p $out/lib/X11/config ln -s $xorgcffiles/lib/X11/config/* $out/lib/X11/config #touch $out/lib/X11/config/host.def # !!! hack #touch $out/lib/X11/config/date.def # !!! hack diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index f260ce90cb541..a1d2040483d0b 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -114,7 +114,7 @@ in setxkbmap = attrs: attrs // { postInstall = '' - ensureDir $out/share + mkdir -p $out/share ln -sfn ${args.xkeyboard_config}/etc/X11 $out/share/X11 ''; }; diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix index 161942519e809..27982601f73a9 100644 --- a/pkgs/servers/xmpp/pyIRCt/default.nix +++ b/pkgs/servers/xmpp/pyIRCt/default.nix @@ -19,7 +19,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)]; deploy = a.fullDepEntry ('' - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix index a4dcd5a481273..e763d2dce5b12 100644 --- a/pkgs/servers/xmpp/pyMAILt/default.nix +++ b/pkgs/servers/xmpp/pyMAILt/default.nix @@ -21,7 +21,7 @@ rec { phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)]; deploy = a.fullDepEntry ('' cd mail-transport - ensureDir $out/bin $out/share/${name} + mkdir -p $out/bin $out/share/${name} sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 6b199e165d0dc..4fd717fa936de 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation { # XXX: think/discuss about this, also with respect to nixos vs nix-on-X postInstall = '' - ensureDir $out/share/ + mkdir -p $out/share/ tar xf ${documentation} -C $out/share - ensureDir $out/etc/ + mkdir -p $out/etc/ cat > $out/etc/zprofile <<EOF if test -e /etc/NIXOS; then if test -r /etc/zprofile; then diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 11ee83b945668..dc9314f6885c3 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -83,10 +83,10 @@ rec { + " --disable-shared"; # brrr... NIX_GCC = runCommand "klibc-wrapper" {} '' - ensureDir $out/bin + mkdir -p $out/bin ln -s ${klibc}/bin/klcc $out/bin/gcc ln -s ${klibc}/bin/klcc $out/bin/cc - ensureDir $out/nix-support + mkdir -p $out/nix-support echo 'PATH=$PATH:${stdenv.gcc.binutils}/bin' > $out/nix-support/setup-hook ''; }); @@ -209,7 +209,7 @@ rec { moveBuildDir = '' - ensureDir $out/.build + mkdir -p $out/.build cd $out/.build ''; } stdenv; diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 623273962393c..660ae0c1490cb 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -39,7 +39,7 @@ exitHandler() { # normally. Otherwise, return the original exit code. if test -n "$succeedOnFailure"; then echo "build failed with exit code $exitCode (ignored)" - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo -n $exitCode > "$out/nix-support/failed" exit 0 fi @@ -139,7 +139,7 @@ ensureDir() { } installBin() { - ensureDir $out/bin + mkdir -p $out/bin cp "$@" $out/bin } @@ -682,7 +682,7 @@ patchShebangs() { installPhase() { runHook preInstall - ensureDir "$prefix" + mkdir -p "$prefix" installTargets=${installTargets:-install} echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" @@ -709,7 +709,7 @@ fixupPhase() { echo "both $d/ and share/$d/ exists!" else echo "fixing location of $d/ subdirectory" - ensureDir $prefix/share + mkdir -p $prefix/share if test -w $prefix/share; then mv -v $prefix/$d $prefix/share ln -sv share/$d $prefix @@ -755,17 +755,17 @@ fixupPhase() { fi if test -n "$propagatedBuildInputs"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" fi if test -n "$propagatedBuildNativeInputs"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs" fi if test -n "$setupHook"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" substituteAll "$setupHook" "$out/nix-support/setup-hook" fi @@ -780,7 +780,7 @@ distPhase() { make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} if test "$dontCopyDist" != 1; then - ensureDir "$out/tarballs" + mkdir -p "$out/tarballs" # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 62ad647064eb1..900b6253c713e 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -123,7 +123,7 @@ rec { bootstrapGlibc = stdenvLinuxBoot0.mkDerivation { name = "bootstrap-glibc"; buildCommand = '' - ensureDir $out + mkdir -p $out ln -s ${bootstrapTools}/lib $out/lib ln -s ${bootstrapTools}/include-glibc $out/include ''; diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index ba2a953a457fc..a780574539f96 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -92,7 +92,7 @@ rec { buildCommand = '' set -x - ensureDir $out/bin $out/lib $out/libexec + mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. cp -d ${glibc}/lib/ld*.so* $out/lib diff --git a/pkgs/stdenv/mingw/setup.sh b/pkgs/stdenv/mingw/setup.sh index 2bc961dfaed62..4de3c0ddc9b4a 100755 --- a/pkgs/stdenv/mingw/setup.sh +++ b/pkgs/stdenv/mingw/setup.sh @@ -38,7 +38,7 @@ exitHandler() { # normally. Otherwise, return the original exit code. if test -n "$succeedOnFailure"; then echo "build failed with exit code $exitCode (ignored)" - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo -n $exitCode > "$out/nix-support/failed" exit 0 fi @@ -133,7 +133,7 @@ ensureDir() { } installBin() { - ensureDir $out/bin + mkdir -p $out/bin cp "$@" $out/bin } @@ -611,7 +611,7 @@ patchShebangs() { installPhase() { runHook preInstall - ensureDir "$prefix" + mkdir -p "$prefix" installTargets=${installTargets:-install} echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}" @@ -638,7 +638,7 @@ fixupPhase() { echo "both $d/ and share/$d/ exists!" else echo "fixing location of $d/ subdirectory" - ensureDir $prefix/share + mkdir -p $prefix/share if test -w $prefix/share; then mv -v $prefix/$d $prefix/share ln -sv $prefix/share/$d $prefix/$d @@ -670,12 +670,12 @@ fixupPhase() { fi if test -n "$propagatedBuildInputs"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" fi if test -n "$setupHook"; then - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" substituteAll "$setupHook" "$out/nix-support/setup-hook" fi @@ -690,7 +690,7 @@ distPhase() { make ${makefile:+-f $makefile} $distFlags "${distFlagsArray[@]}" ${distTarget:-dist} if test "$dontCopyDist" != 1; then - ensureDir "$out/tarballs" + mkdir -p "$out/tarballs" # Note: don't quote $tarballs, since we explicitly permit # wildcards in there. diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index a3d21ab1800e9..adc04b629444a 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.randrproto ]; - preInstall = "ensureDir $out"; + preInstall = "mkdir -p $out"; meta = { homepahe = http://fredrik.hubbe.net/x2vnc.html; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index abe5c9b59d600..5d68e1da1ba9c 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/man/man1 + mkdir -p $out/bin + mkdir -p $out/man/man1 cp x2x $out/bin/ cp x2x.1 $out/man/man1/ ''; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 0691521e44cf4..cf7692cc58acc 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -r install/* $out for i in $(cd $out/bin && ls); do diff --git a/pkgs/tools/admin/tightvnc/builder.sh b/pkgs/tools/admin/tightvnc/builder.sh index 72fced3772862..10590bbfcf1ed 100644 --- a/pkgs/tools/admin/tightvnc/builder.sh +++ b/pkgs/tools/admin/tightvnc/builder.sh @@ -31,13 +31,13 @@ buildPhase() { } installPhase() { - ensureDir $out/bin - ensureDir $out/share/man/man1 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 ./vncinstall $out/bin $out/share/man # fix HTTP client: t=$out/share/tightvnc - ensureDir $t + mkdir -p $t sed -i "s@/usr/local/vnc/classes@$out/vnc/classes@g" $out/bin/vncserver cp -r classes $t } diff --git a/pkgs/tools/archivers/unarj/default.nix b/pkgs/tools/archivers/unarj/default.nix index 7a15514a7287a..0852674e8c89c 100644 --- a/pkgs/tools/archivers/unarj/default.nix +++ b/pkgs/tools/archivers/unarj/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin sed -i -e s,/usr/local/bin,$out/bin, Makefile ''; diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index 20d5ae7715e5b..b1fd5a10c2b46 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation rec { installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp unetbootin $out/bin - ensureDir $out/share/unetbootin + mkdir -p $out/share/unetbootin cp unetbootin_*.qm $out/share/unetbootin - ensureDir $out/share/applications + mkdir -p $out/share/applications cp unetbootin.desktop $out/share/applications wrapProgram $out/bin/unetbootin \ diff --git a/pkgs/tools/compression/bsdiff/builder.sh b/pkgs/tools/compression/bsdiff/builder.sh index 1acb10cb7946b..f2792a40a60c9 100644 --- a/pkgs/tools/compression/bsdiff/builder.sh +++ b/pkgs/tools/compression/bsdiff/builder.sh @@ -2,7 +2,7 @@ source $stdenv/setup installFlags="PREFIX=$out INSTALL=install" -ensureDir "$out/bin" -ensureDir "$out/man/man1" +mkdir -p "$out/bin" +mkdir -p "$out/man/man1" genericBuild diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index ea2ebc4c2db05..4610bdd40850e 100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -8,7 +8,7 @@ if test -n "$sharedLibrary"; then } preInstall() { - ensureDir $out/lib + mkdir -p $out/lib mv libbz2.so* $out/lib ln -s libbz2.so.1.0 $out/lib/libbz2.so } diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c3fd01d5c88b3..f3b8037a9f192 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { cd src "; - installPhase = "ensureDir $out/bin ; cp upx.out $out/bin/upx"; + installPhase = "mkdir -p $out/bin ; cp upx.out $out/bin/upx"; meta = { homepage = http://upx.sourceforge.net/; diff --git a/pkgs/tools/compression/zdelta/builder.sh b/pkgs/tools/compression/zdelta/builder.sh index 376c0bf4f39c4..03db413181d74 100644 --- a/pkgs/tools/compression/zdelta/builder.sh +++ b/pkgs/tools/compression/zdelta/builder.sh @@ -1,7 +1,7 @@ source $stdenv/setup installPhase() { - ensureDir $out/bin + mkdir -p $out/bin cp -p zdc zdu $out/bin } diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 622424c302fba..0e72c45e31ad1 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/etc $out/var/lib + mkdir -p $out/etc $out/var/lib makeFlags="$makeFlags prefix=$out" ''; diff --git a/pkgs/tools/filesystems/fusesmb/default.nix b/pkgs/tools/filesystems/fusesmb/default.nix index d6d5c3a48aaf7..4ddab385a4274 100644 --- a/pkgs/tools/filesystems/fusesmb/default.nix +++ b/pkgs/tools/filesystems/fusesmb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/lib + mkdir -p $out/lib ln -fs ${samba}/lib/libsmbclient.so $out/lib/libsmbclient.so.0 ''; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index afa4be345a942..717b08acc5f90 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { ]; installPhase = - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v httpfs2 "$out/bin" - ensureDir "$out/share/man/man1" + mkdir -p "$out/share/man/man1" cp -v *.1 "$out/share/man/man1" ''; diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix index 606914cd976ea..fcb3c23ed1d39 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/default.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib fuse ]; postInstall = '' - ensureDir $out/sbin + mkdir -p $out/sbin ln -sf $out/bin/sshfs $out/sbin/mount.sshfs ''; diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 435305f1e2af8..26df8818b2b6e 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -16,10 +16,10 @@ rec { phaseNames = ["doMake" "copyFiles"]; copyFiles = a.fullDepEntry '' - ensureDir $out/bin + mkdir -p $out/bin cp cfdg $out/bin/ - ensureDir $out/share/doc/${name} + mkdir -p $out/share/doc/${name} cp *.txt $out/share/doc/${name} '' ["defEnsureDir" "doMake"]; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 232b6c5464a96..13f7d4b7f6fc4 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -22,7 +22,7 @@ rec { libc = if a.stdenv ? glibc then a.stdenv.glibc else ""; doCmake = a.fullDepEntry('' - ensureDir $PWD/builddir + mkdir -p $PWD/builddir cd builddir export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 8ee02710b05fd..959241d30abf2 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin set +e sh install set -e diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 32048db4154ea..531e17b92cbb6 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin $out/man/man1 + mkdir -p $out/bin $out/man/man1 ''; meta = { diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 02db33f92cb19..ed29b743d546f 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { "; installPhase = " - ensureDir $out/bin + mkdir -p $out/bin cp glxinfo glxgears $out/bin/ "; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 2d98a1efdce11..c497d60aef9a1 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; preInstall = '' - ensureDir $out/bin + mkdir -p $out/bin ''; meta = { diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 1fc14445bbdbb..fd26174f197a2 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp pdfread.py $out/bin chmod +x $out/bin/pdfread.py LIBSUFFIX=lib/${python.libPrefix}/site-packages/ PYDIR=$out/$LIBSUFFIX - ensureDir $PYDIR + mkdir -p $PYDIR cp -R *.py pylrs $PYDIR wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \ diff --git a/pkgs/tools/graphics/ploticus/builder.sh b/pkgs/tools/graphics/ploticus/builder.sh index 89d4e3b98eaf0..2fb16b259bdcf 100644 --- a/pkgs/tools/graphics/ploticus/builder.sh +++ b/pkgs/tools/graphics/ploticus/builder.sh @@ -5,12 +5,12 @@ preBuild() { } preInstall() { - ensureDir $out/bin + mkdir -p $out/bin } postInstall() { # Install the "prefabs". - ensureDir $out/share/ploticus/prefabs && \ + mkdir -p $out/share/ploticus/prefabs && \ cd .. && \ cp -rv prefabs/* $out/share/ploticus/prefabs diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix index 16c91720964a5..edd0a96c689f2 100644 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ b/pkgs/tools/graphics/qrdecode/default.nix @@ -34,7 +34,7 @@ rec { cd .. '' ["doMake"]; createDirs = fullDepEntry '' - ensureDir $out/bin $out/lib $out/include $out/share + mkdir -p $out/bin $out/lib $out/include $out/share '' ["defEnsureDir"]; name = "libdecodeqr-" + version; diff --git a/pkgs/tools/graphics/transfig/builder.sh b/pkgs/tools/graphics/transfig/builder.sh index f128c4ce36487..c466f759446ce 100644 --- a/pkgs/tools/graphics/transfig/builder.sh +++ b/pkgs/tools/graphics/transfig/builder.sh @@ -31,8 +31,8 @@ buildPhase() { } preInstall() { - ensureDir $out - ensureDir $out/lib + mkdir -p $out + mkdir -p $out/lib } genericBuild diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 0076b2a4a8622..d02b38b41279b 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -32,7 +32,7 @@ rec { doDeploy = a.simplyShare "welkin"; createBin = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" echo "#! ${a.stdenv.shell}" > "$out/bin/welkin" echo "export JAVA_HOME=${jre}" >> "$out/bin/welkin" echo "\"$out/share/welkin/welkin.sh\" \"\$@\"" >> "$out/bin/welkin" diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index ac3aa5a6b1e34..397e80a745ecd 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -21,10 +21,10 @@ let version = "4"; in buildInputs = [ python ]; installPhase = '' - ensureDir "$out/bin" "$out/share/man/man1" + mkdir -p "$out/bin" "$out/share/man/man1" yes no | sh ./install.sh - ensureDir "$out/etc/bash_completion.d" + mkdir -p "$out/etc/bash_completion.d" cp -v autojump.bash "$out/etc/bash_completion.d" echo "Bash users: Make sure to source \`$out/etc/bash_completion.d/autojump.bash'" diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 53027246b7f2a..33a1fc839ce09 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { installPhase = '' cp -r . $out; cd $out t=bin/debootstrap - ensureDir bin man/man8 + mkdir -p bin man/man8 cat >> $t << EOF #!/bin/sh export DEBOOTSTRAP_DIR=$out/usr/share/debootstrap @@ -66,7 +66,7 @@ stdenv.mkDerivation { /* build from source: installPhase = '' cp ${devices} devices.tar.gz - ensureDir $out/{bin,man/man8}; + mkdir -p $out/{bin,man/man8}; cp debootstrap.8 $out/man/man8 sed -i \ -e 's@-o root@@' \ diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index 72e368e709e1b..b9a15ac6a2045 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [zlib bzip2 openssl]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp dmg2img $out/bin ''; } diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index d203419cd69a3..7ceecc3690ab9 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp dtach $out/bin/dtach ''; diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 9f0892bb0aa1b..a32e5abbb29bc 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -32,5 +32,5 @@ stdenv.mkDerivation { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; }; - postInstall="cp expect{,k} $out/bin; ensureDir $out/lib; cp *.so $out/lib"; + postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib"; } diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index 04a0662a3b6e1..2de9efdac58a4 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; # workaround: otherwise make install fails (should be fixed in trunk) - preInstall = "ensureDir $out/bin $out/man/man1"; + preInstall = "mkdir -p $out/bin $out/man/man1"; makeFlags = "PREFIX=\${out}"; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 00265d1f31d4c..3f89713918fcd 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; preConfigure = '' - ensureDir $out/{man/man6,bin} + mkdir -p $out/{man/man6,bin} makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" ''; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 202d28684d0c8..7db9324c2813a 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { configurePhase = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support cp $db $out/nix-support/hddtemp.db ./configure --prefix=$out --with-db-path=$out/nix-support/hddtemp.db ''; diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh index aa4ba13963cd3..1e73b674c157d 100644 --- a/pkgs/tools/misc/jdiskreport/builder.sh +++ b/pkgs/tools/misc/jdiskreport/builder.sh @@ -2,11 +2,11 @@ source $stdenv/setup unzip $src -ensureDir $out/jars +mkdir -p $out/jars mv */*.jar $out/jars jar=$(ls $out/jars/jdiskreport-*.jar) -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/jdiskreport <<EOF #! $SHELL -e exec $jdk/bin/java -jar $jar diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index b664e9d92b6af..db2d6cffc4089 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; unpackPhase = '' - ensureDir src + mkdir -p src pushd src tar xvzf $src ''; @@ -22,8 +22,8 @@ stdenv.mkDerivation { ''; buildPhase = "make -f makefile linux"; installPhase = '' - ensureDir $out/bin - ensureDir $out/man/man1 + mkdir -p $out/bin + mkdir -p $out/man/man1 make -f makefile install ''; diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix index 1e744afdf409c..633d08e4c6660 100644 --- a/pkgs/tools/misc/memtest86/default.nix +++ b/pkgs/tools/misc/memtest86/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-I."; installPhase = '' - ensureDir $out + mkdir -p $out cp memtest.bin $out/ ''; diff --git a/pkgs/tools/misc/myhasktags/default.nix b/pkgs/tools/misc/myhasktags/default.nix index 8c5eb24af484f..62d4ee2579f0d 100644 --- a/pkgs/tools/misc/myhasktags/default.nix +++ b/pkgs/tools/misc/myhasktags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { }; phases="buildPhase"; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin ghc --make $src -o $out/bin/hasktags-modified ''; buildInputs = [ ghcPlain ]; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index e3a9e7b87c3d9..37636da723506 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { makeFlags = [ "LIBUSB=${libusb}" "linux" ]; installPhase = '' - ensureDir $out/bin $out/share/pk2 + mkdir -p $out/bin $out/share/pk2 cp pk2cmd $out/bin cp PK2DeviceFile.dat $out/share/pk2 wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index b6c69be2f09ed..a3a34d95fb5b3 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patchPhase = '' cd src substituteInPlace config --replace /bin/bash /bin/sh - ensureDir $out + mkdir -p $out export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${libX11}/lib" ''; meta = { diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index d2fa91d3fe80e..4f271bcd6237e 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp RockboxUtility $out/bin ''; diff --git a/pkgs/tools/misc/shebangfix/default.nix b/pkgs/tools/misc/shebangfix/default.nix index 082b04b95d783..68f20df057765 100644 --- a/pkgs/tools/misc/shebangfix/default.nix +++ b/pkgs/tools/misc/shebangfix/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { phases = "buildPhase"; buildPhase = '' - ensureDir $out/bin + mkdir -p $out/bin s=$out/bin/shebangfix cp $file $s chmod +wx $s diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index c112afaee0f43..2deb8893f4e06 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { preConfigure = '' find -type f | xargs sed -i 's@/usr/bin/perl@${perl}/bin/perl@' - ensureDir $out + mkdir -p $out sed -e 's/chown/true/' \ -e 's/chgrp/true/' \ -e 's@^CFLAGS_FT =.*@CFLAGS_FT=-DUSE_FREETYPE -I${freetype}/include/freetype2@' \ diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index e4e8d3c3e9b54..3f05d600944bc 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ]; preInstall = '' - ensureDir $out; makeFlags="DESTDIR=$out BINDIR=/bin" + mkdir -p $out; makeFlags="DESTDIR=$out BINDIR=/bin" ''; buildInputs = [freetype fontconfig libunwind libtool flex bison]; diff --git a/pkgs/tools/misc/vfdecrypt/default.nix b/pkgs/tools/misc/vfdecrypt/default.nix index 46a841113a171..5692aecebbf0e 100644 --- a/pkgs/tools/misc/vfdecrypt/default.nix +++ b/pkgs/tools/misc/vfdecrypt/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [openssl]; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp vfdecrypt $out/bin ''; } diff --git a/pkgs/tools/misc/w3c-css-validator/default.nix b/pkgs/tools/misc/w3c-css-validator/default.nix index 93231397feb57..5cfe873763888 100644 --- a/pkgs/tools/misc/w3c-css-validator/default.nix +++ b/pkgs/tools/misc/w3c-css-validator/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { -e '/untar/d' \ build.xml ant - ensureDir $out/{bin,lib} + mkdir -p $out/{bin,lib} JAR=$out/lib/css-validator.jar cat >> $out/bin/css-validator << EOF #!/bin/sh diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index cb2631bd5d84b..74ee8b5b54844 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -32,7 +32,7 @@ rec { phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"]; prepareDirs = a.fullDepEntry '' - ensureDir "$out/bin" "$out/share" "$out/share/man/man1" + mkdir -p "$out/bin" "$out/share" "$out/share/man/man1" '' ["minInit" "defEnsureDir"]; goSrcDir = "cd X11"; diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix index a98f307c77dc9..8335b0eb8db32 100644 --- a/pkgs/tools/networking/altermime/default.nix +++ b/pkgs/tools/networking/altermime/default.nix @@ -31,7 +31,7 @@ rec { phaseNames = ["doPatch" "fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@/usr/local@$out@" - ensureDir "$out/bin" + mkdir -p "$out/bin" '') ["doUnpack" "minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index fc29af989ceab..808c738110e0d 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -16,5 +16,5 @@ stdenv.mkDerivation rec { preBuild = "cd finger"; - preInstall = '' ensureDir $out/man/man1 $out/bin ''; + preInstall = '' mkdir -p $out/man/man1 $out/bin ''; } diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index f586502078544..cd3ae12a11b8e 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -11,9 +11,9 @@ stdenv.mkDerivation { buildInputs = [ which ]; installPhase = '' - ensureDir $out/bin; cp cntlm $out/bin/; - ensureDir $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; - ensureDir $out/man/; cp doc/cntlm.1 $out/man/; + mkdir -p $out/bin; cp cntlm $out/bin/; + mkdir -p $out/share/; cp COPYRIGHT README VERSION doc/cntlm.conf $out/share/; + mkdir -p $out/man/; cp doc/cntlm.1 $out/man/; ''; meta = { diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 7c1e89083b870..e57ba489450fb 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -15,7 +15,7 @@ buildPerlPackage { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp ddclient $out/bin ''; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index cdab68f22ea9d..c9e1b58d2d2c5 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libpcap ncurses ]; preInstall = '' - ensureDir $out/share/man/man8 $out/bin + mkdir -p $out/share/man/man8 $out/bin ''; meta = { diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix index c55688d5060a1..8649eda4bf716 100644 --- a/pkgs/tools/networking/eggdrop/default.nix +++ b/pkgs/tools/networking/eggdrop/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = '' prefix=$out/eggdrop - ensureDir $prefix + mkdir -p $prefix ''; postConfigure = '' diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index c3ac4e205ae22..cbc07522019a3 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp flvstreamer $out/bin cp streams $out/bin cp rtmpsrv $out/bin diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index 9383b857a3a74..c74dbe5282903 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -11,8 +11,8 @@ let version = "20000331"; in preConfigure = '' makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) - ensureDir "$out/bin" - ensureDir "$out/share/man/man1" + mkdir -p "$out/bin" + mkdir -p "$out/share/man/man1" ''; installTargets = "install man"; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index 1039cadb3ee55..34ec8eed90ea5 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man3 + mkdir -p $out/share/man/man3 cp man3/miniupnpc.3 $out/share/man/man3/ ''; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 5d62222d1419b..6db47f8e079fc 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 cp miniupnpd.1 $out/share/man/man1/ ''; diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index a834ffc37396e..684507a1d2e0c 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -37,7 +37,7 @@ rec { '' ["doUnpack" "addInputs"]; doDeploy = a.fullDepEntry '' - ensureDir "$out/bin" + mkdir -p "$out/bin" cp netboot "$out/bin" '' ["defEnsureDir" "minInit"]; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index adf85a981d1b7..6b9763972dfb4 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = " - ensureDir $out/man/man{1,8} $out/sbin $out/bin + mkdir -p $out/man/man{1,8} $out/sbin $out/bin "; meta = { diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 69243b4f68e93..7cadf8a1345d6 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preConfigure = '' configureFlags="$configureFlags --with-privsep-path=$out/empty" - ensureDir $out/empty + mkdir -p $out/empty ''; postInstall = @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/ssh-copy-id cp contrib/ssh-copy-id.1 $out/share/man/man1/ - ensureDir $out/etc/ssh + mkdir -p $out/etc/ssh cp moduli $out/etc/ssh/ ''; diff --git a/pkgs/tools/networking/p2p/azureus/builder.sh b/pkgs/tools/networking/p2p/azureus/builder.sh index 13b7a48319277..9d41dba2e439e 100644 --- a/pkgs/tools/networking/p2p/azureus/builder.sh +++ b/pkgs/tools/networking/p2p/azureus/builder.sh @@ -1,9 +1,9 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars cp $src $out/jars/azureus.jar -ensureDir $out/bin +mkdir -p $out/bin cat > $out/bin/azureus <<EOF #! $SHELL -e azureusHome=$out diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 4056c6429b061..ae52865eace84 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ]; postInstall = '' - ensureDir $out/share/man/man1 + mkdir -p $out/share/man/man1 mv doc/rtorrent.1 $out/share/man/man1/rtorrent.1 ''; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index b48600a9f9961..5ef4a640d2a04 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -66,7 +66,7 @@ buildPythonPackage { # something writable doesn't help; providing $FONTCONFIG_FILE doesn't # help either. So we just don't run `make' under `docs/'. - ensureDir "$out/share/doc/${name}" + mkdir -p "$out/share/doc/${name}" cp -rv "docs/"* "$out/share/doc/${name}" find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index 8ade37976b6a8..7457a72b5d50d 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -32,7 +32,7 @@ rec { installProgram = a.fullDepEntry('' mv "$out/share/philter/".*rc "$out/share/philter/philterrc" - ensureDir "$out/bin" + mkdir -p "$out/bin" cp "$out/share/philter/src/philter.py" "$out/bin/philter" chmod a+x "$out/bin/philter" '') ["addInputs" "copyToShare" "minInit"]; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index 895b2c4be4fd3..07196b77d0a2a 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -30,7 +30,7 @@ rec { phaseNames = ["fixTarget" "doMakeInstall"]; fixTarget = a.fullDepEntry ('' sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" - ensureDir "$out/bin" "$out/man/man1" + mkdir -p "$out/bin" "$out/man/man1" '') ["doUnpack" "minInit" "defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index 8a704bb571184..5079b951a6452 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -32,7 +32,7 @@ rec { '') ["minInit" "doUnpack"]; makeDirs = a.fullDepEntry('' - ensureDir $out/share/${name}/etc/ppp + mkdir -p $out/share/${name}/etc/ppp '') ["minInit" "defEnsureDir"]; name = "rp-pppoe-" + version; diff --git a/pkgs/tools/networking/s3sync/default.nix b/pkgs/tools/networking/s3sync/default.nix index 8ed71c3452346..48788d36884cb 100644 --- a/pkgs/tools/networking/s3sync/default.nix +++ b/pkgs/tools/networking/s3sync/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out/libexec/s3sync + mkdir -p $out/libexec/s3sync cp *.rb $out/libexec/s3sync makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3cmd.rb" $out/bin/s3cmd makeWrapper "${ruby}/bin/ruby $out/libexec/s3sync/s3sync.rb" $out/bin/s3sync - ensureDir $out/share/doc/s3sync + mkdir -p $out/share/doc/s3sync cp README* $out/share/doc/s3sync/ ''; # */ diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index bb588f3659992..ebbfcb5d36081 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["doConfigure" "createDirs" "doMakeInstall"]; createDirs = a.fullDepEntry '' - ensureDir "$out/"{bin,lib,share/man,etc} + mkdir -p "$out/"{bin,lib,share/man,etc} '' ["defEnsureDir"]; meta = { diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 38b7c27b6fde3..9006fadfcdb98 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/share/slimrat $out/bin + mkdir -p $out/share/slimrat $out/bin cp -R src/* $out/share/slimrat # slimrat-gui does not work (it needs the Gtk2 perl package) for i in slimrat; do diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 65a1d241c0bd2..795c0cfc8ccb4 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/{bin,man/man8,man/man1} + mkdir -p $out/{bin,man/man8,man/man1} cp client $out/bin/stun cp server $out/bin/stund cp debian/manpages/stund.8 $out/man/man8 diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 4cb47fada0616..007efa42827aa 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installPhase = '' make install prefix="$out" - ensureDir "$out/share/${name}" + mkdir -p "$out/share/${name}" cp -v default.sdf "$out/share/${name}" sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" diff --git a/pkgs/tools/networking/tcng/default.nix b/pkgs/tools/networking/tcng/default.nix index dd2082d30b245..062977b455c3a 100644 --- a/pkgs/tools/networking/tcng/default.nix +++ b/pkgs/tools/networking/tcng/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { # manually copy tcc and include files.. see comment above installPhase = '' - ensureDir $out{,/sbin,/lib/tcng/include} + mkdir -p $out{,/sbin,/lib/tcng/include} make DESTDIR=$out install cp tcc/tcc $out/sbin cp tcc/*.tc $out/lib/tcng/include diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 7d72016cfe278..8c8c024120494 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin $out/lib $out/include + mkdir -p $out/bin $out/lib $out/include cp c-client/*.h c-client/linkage.c $out/include cp c-client/c-client.a $out/lib/libc-client.a cp mailutil/mailutil imapd/imapd dmail/dmail mlock/mlock mtest/mtest tmail/tmail \ diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix index 6cc18ec8678f1..837ab3627faf7 100644 --- a/pkgs/tools/networking/wakelan/default.nix +++ b/pkgs/tools/networking/wakelan/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; preInstall = '' - ensureDir $out/man/man1 $out/bin + mkdir -p $out/man/man1 $out/bin ''; meta = { diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 19f30713a9fed..9c1f8c8dd39e1 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { installPhase = '' python setup.py install --prefix=$out - ensureDir $out/share/other + mkdir -p $out/share/other cp other/dhclient.conf.template.default $out/share/other/dhclient.conf.template.default # Add a template for "WPA2 Enterprise" encryption as used, e.g., by the diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 0a830e75d8043..3200d27c004b3 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -26,7 +26,7 @@ rec { cd bmrsa unzip ${src} sed -e 's/gcc/g++/' -i Makefile - ensureDir $out/bin + mkdir -p $out/bin echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile '') ["minInit" "addInputs" "defEnsureDir"]; diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index e7545ac8cd6a8..73f7f8c9ae5ef 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; installPhase = " - ensureDir $out/sbin + mkdir -p $out/sbin cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin "; diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix index 94bc009080df9..e02ce1316ba97 100644 --- a/pkgs/tools/security/metasploit/3.1.nix +++ b/pkgs/tools/security/metasploit/3.1.nix @@ -9,8 +9,8 @@ rec { configureFlags = []; doInstall = fullDepEntry('' - ensureDir $out/share/msf - ensureDir $out/bin + mkdir -p $out/share/msf + mkdir -p $out/bin cp -r * $out/share/msf diff --git a/pkgs/tools/security/opensc-dnie-wrapper/default.nix b/pkgs/tools/security/opensc-dnie-wrapper/default.nix index ec649790e6778..b36d99f8ebf02 100644 --- a/pkgs/tools/security/opensc-dnie-wrapper/default.nix +++ b/pkgs/tools/security/opensc-dnie-wrapper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = [ "installPhase" ]; installPhase = '' - ensureDir $out/etc + mkdir -p $out/etc cp ${opensc}/etc/opensc.conf $out/etc chmod +w $out/etc/opensc.conf diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index d5462a1120ae1..3ca410328152f 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation { buildPhase = "true"; installPhase = - '' ensureDir "$out/bin" + '' mkdir -p "$out/bin" cp -v pius "$out/bin" - ensureDir "$out/doc/pius-${version}" + mkdir -p "$out/doc/pius-${version}" cp -v README "$out/doc/pius-${version}" ''; diff --git a/pkgs/tools/security/seccure/0.4.nix b/pkgs/tools/security/seccure/0.4.nix index 0a1452e535567..33a77c078446f 100644 --- a/pkgs/tools/security/seccure/0.4.nix +++ b/pkgs/tools/security/seccure/0.4.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e s@/usr/@$out/@g -i Makefile sed -e 's@ln -f@ln -sf@g' -i Makefile - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 ''; meta = { diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 3816df415c695..74682d00d0334 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -e s@/usr/@$out/@g -i Makefile cp ssss.manpage.xml ssss.1 cp ssss.manpage.xml ssss.1.html - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile ''; diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 24a1558e901d3..bb3f9d72e8280 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out/sbin $out/etc + mkdir -p $out/sbin $out/etc cp script/bootchartd $out/sbin cp script/bootchartd.conf $out/etc chmod +x $out/sbin/bootchartd diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 17583f612dc02..6132abc087903 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { echo '#define _PATH_SENDMAIL "${sendmailPath}"' >> pathnames.h ''; - preInstall = "ensureDir $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; + preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; meta = { description = "Vixie Cron, a daemon for running commands at specific times"; diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index b018de88f4647..57f9a1a57d519 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -40,7 +40,7 @@ rec { fixPaths = a.doPatchShebangs ''$out/bin''; install_dd_rhelp = a.fullDepEntry ('' - ensureDir "$out/share/dd_rescue" "$out/bin" + mkdir -p "$out/share/dd_rescue" "$out/bin" tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue" cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin" '') ["minInit" "defEnsureDir"]; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 35c510f625c9c..f82c94c0a726f 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid popt icu ncurses ]; installPhase = '' - ensureDir $out/sbin - ensureDir $out/share/man/man8 + mkdir -p $out/sbin + mkdir -p $out/share/man/man8 install -v -m755 gdisk sgdisk fixparts $out/sbin install -v -m644 gdisk.8 sgdisk.8 fixparts.8 \ $out/share/man/man8 diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index f33dc7227fba1..bf5e6eeffa5a9 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -40,7 +40,7 @@ popd # Installation export PLAN9=$out -ensureDir $PLAN9 +mkdir -p $PLAN9 GLOBIGNORE='src:.*' cp -R * $PLAN9 GLOBIGNORE= diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index 02654cd892288..05494e54a3ecf 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp clit $out/bin ''; diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 3beb47b069635..1485bbcd46745 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -21,7 +21,7 @@ rec { installFlags = "PREFIX=$out"; doDeploy = a.fullDepEntry ('' - ensureDir $out/bin + mkdir -p $out/bin cp dadadodo $out/bin '') [ "minInit" "doMake" "defEnsureDir"]; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index d033cf4ba6f66..7c76c7f1bca23 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 perl ]; configurePhase = '' - ensureDir $out/{bin,man/man1} + mkdir -p $out/{bin,man/man1} makeFlags="PREFIX=$out" ''; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 01e58146ed8fc..72dbdbf647f5c 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { makeFlags = "TREE=\$(out) MANTREE=\$(TREE)/share/man CC=${stdenv.cross.config}-gcc"; }; - preInstall = "ensureDir \$out/share/man"; + preInstall = "mkdir -p \$out/share/man"; postInstall = "mv \$out/bin/replace \$out/bin/replace-literal"; patches = [./malloc.patch]; diff --git a/pkgs/tools/text/xml/jing/script-builder.sh b/pkgs/tools/text/xml/jing/script-builder.sh index 0a7cdc5b8a865..d9cc884927692 100644 --- a/pkgs/tools/text/xml/jing/script-builder.sh +++ b/pkgs/tools/text/xml/jing/script-builder.sh @@ -1,6 +1,6 @@ source $stdenv/setup -ensureDir $out/bin +mkdir -p $out/bin cat >> $out/bin/jing <<EOF #! $SHELL diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index 3ec035c105e29..ee66cf9237744 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp rxp $out/bin ''; meta = { diff --git a/pkgs/tools/text/xml/trang/builder.sh b/pkgs/tools/text/xml/trang/builder.sh index 9ae7f7bfe9293..9fe712360babb 100644 --- a/pkgs/tools/text/xml/trang/builder.sh +++ b/pkgs/tools/text/xml/trang/builder.sh @@ -1,10 +1,10 @@ source $stdenv/setup -ensureDir $out/jars +mkdir -p $out/jars unzip -j $src '*/trang.jar' cp -p *.jar $out/jars -ensureDir $out/bin +mkdir -p $out/bin cat >> $out/bin/trang <<EOF #! $SHELL diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 31c5785028508..a4b9d375bcede 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sed -i -e "s,/etc/vim,,g" Makefile.in ''; - preInstall = "ensureDir $out/etc/vim"; + preInstall = "mkdir -p $out/etc/vim"; buildInputs = [ python ]; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index 68c09f86e1187..5a2c5fb2e067e 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { ''; installPhase = '' - ensureDir $out/bin - ensureDir $out/share/man/man1 + mkdir -p $out/bin + mkdir -p $out/share/man/man1 pushd doc make halibut.1 popd diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix index 61e1dfb9d8759..a78feaadb18f6 100644 --- a/pkgs/tools/typesetting/lhs2tex/default.nix +++ b/pkgs/tools/typesetting/lhs2tex/default.nix @@ -8,9 +8,9 @@ cabal.mkDerivation (self: { extraBuildInputs = [regexCompat texLive]; postInstall = '' - ensureDir "$out/share/doc/$name" + mkdir -p "$out/share/doc/$name" cp doc/Guide2.pdf $out/share/doc/$name - ensureDir "$out/nix-support" + mkdir -p "$out/nix-support" ''; meta = { diff --git a/pkgs/tools/typesetting/pdfjam/builder.sh b/pkgs/tools/typesetting/pdfjam/builder.sh index a710bc120230d..9fcb80f68668e 100644 --- a/pkgs/tools/typesetting/pdfjam/builder.sh +++ b/pkgs/tools/typesetting/pdfjam/builder.sh @@ -2,8 +2,8 @@ source $stdenv/setup tar zxvf $src -ensureDir $out/bin +mkdir -p $out/bin cp pdfjam/scripts/* $out/bin -ensureDir $out/man/man1 +mkdir -p $out/man/man1 cp pdfjam/man1/* $out/man/man1 diff --git a/pkgs/tools/typesetting/pdftk/default.nix b/pkgs/tools/typesetting/pdftk/default.nix index 3a6c934928dc6..28a43e69598c8 100644 --- a/pkgs/tools/typesetting/pdftk/default.nix +++ b/pkgs/tools/typesetting/pdftk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { preBuild = "cd pdftk"; installPhase = '' - ensureDir $out/bin $out/share/man/man1 + mkdir -p $out/bin $out/share/man/man1 cp pdftk $out/bin cp ../debian/pdftk.1 $out/share/man/man1 ''; diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix index f6f32a7c5b790..d582609478bbf 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out mv * $out rm $out/*.txt diff --git a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix index d79afe7e90f4a..73b65a7e0fc9c 100644 --- a/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-api-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' - ensureDir $out + mkdir -p $out mv * $out rm $out/bin/*.cmd # Windows stuff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a74ed18fd4c6a..fc6424ae60dc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3554,11 +3554,11 @@ let glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc; } '' - ensureDir $out + mkdir -p $out ln -s $glibc64/* $out/ rm $out/lib $out/lib64 - ensureDir $out/lib + mkdir -p $out/lib ln -s $glibc64/lib/* $out/lib ln -s $glibc32/lib $out/lib/32 ln -s lib $out/lib64 diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index fb9c772d9ac05..fad3993ddc127 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -66,18 +66,18 @@ releaseTools.makeSourceTarball { distPhase = '' find . -name "\.svn" -exec rm -rvf {} \; -prune - ensureDir $out/tarballs + mkdir -p $out/tarballs mkdir ../$releaseName cp -prd . ../$releaseName (cd .. && tar cfa $out/tarballs/$releaseName.tar.bz2 $releaseName) || false (cd .. && tar cfa $out/tarballs/$releaseName.tar.lzma $releaseName) || false - ensureDir $out/release-notes + mkdir -p $out/release-notes cp doc/NEWS.html $out/release-notes/index.html cp doc/style.css $out/release-notes/ echo "doc release-notes $out/release-notes" >> $out/nix-support/hydra-build-products - ensureDir $out/manual + mkdir -p $out/manual cp doc/manual.html $out/manual/index.html cp doc/style.css $out/manual/ echo "doc manual $out/manual" >> $out/nix-support/hydra-build-products diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9cc483ef3ab0..5e8cf9553d92b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1035,7 +1035,7 @@ let pythonPackages = python.modules // rec { installCommand = '' dest=$(toPythonPath $out)/optfunc - ensureDir $dest + mkdir -p $dest cp * $dest/ ''; @@ -1543,10 +1543,10 @@ let pythonPackages = python.modules // rec { installPhase = '' dest=$(toPythonPath $out)/pysvn - ensureDir $dest + mkdir -p $dest cp pysvn/__init__.py $dest/ cp pysvn/_pysvn*.so $dest/ - ensureDir $out/share/doc + mkdir -p $out/share/doc mv -v ../Docs $out/share/doc/pysvn-1.7.2 rm -v $out/share/doc/pysvn-1.7.2/generate_cpp_docs_from_html_docs.py ''; |