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/applications | |
| parent | f7159c195a623c311829c38c40ef010ac6e943f7 (diff) | |
| download | nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.gz nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.bz2 nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.lz nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.xz nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.zst nixpkgs-c556a6ea46e71e1907d78b71fab36df30297b3ad.zip | |
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
Diffstat (limited to 'pkgs/applications')
136 files changed, 208 insertions, 208 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index c9f0fb98af7..2a0caf93001 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 bdda1c6d8d9..e75be3e2c2b 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 7f062b1799f..8e7f573cc84 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 1557913f401..b563c850d52 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 8cd3dcc1bfb..30ba34af16c 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 86ffca4242f..d5a8138a500 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 4ea26b458a7..ccaa428a3f4 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 e7957e866f1..c295767687f 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 d3ac4c4168c..3a2beff0413 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 b751e4da33e..279820a723f 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 528f0b3412c..0cfbfb4c9bd 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 bc53dfc70f3..801efc166da 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 511e284ed39..e1d2ad69b1d 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 52afebc6297..ec7a3e8e600 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 6a91ac49651..46381dfc648 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 258c13b8eb7..f94d594519c 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 3a977031436..5439ba9e4d6 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 5813fde815f..b73d91b611c 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 9dba1d599ff..24eba20be6c 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 2d93e782048..02f60d0d698 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 18ea2797bec..f0a51987937 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 317f121f364..86371890db1 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 9bb7870fb5a..787f5df6eb0 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 3b6361b9ef7..71a2993aba8 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 c78d40bcb5f..08fb64002a0 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 5349f10c0c3..194f13a090c 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 8af3d96918d..1126a7278d6 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 51b5f183654..15706b0c37d 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 c759f977b0d..81e0dd35db9 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 3c900ca1eba..b80d27bfcf9 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 795417dbf5b..2557f0f82e5 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 7c3826369ee..dc397a614d3 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 8ddaf9bc279..9b39d8e8f1f 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 8f7ba792914..e3c6deddb29 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 12f01adc830..349982bc24c 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 eda187cbf23..4b61ac740cb 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 b40a7251283..6d39c7f2a95 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 a746eb86b94..307c9477929 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 cd4bebfe9ad..1f4844a22c4 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 ab22312e903..caaa5133c75 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 d56ebe6b17f..de74cd6abd9 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 6a66c45b94f..b27f60e9bff 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 24071d3c683..f67138e66a7 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 1a0453797cc..0e222366729 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 aa4807a34f5..8da4e9de8fd 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 56c547ce435..70cd5d3faf4 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 08edc32e87e..9ea5f18ee62 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 e308ebe0477..a526774d48e 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 3b42f0f3322..74f657ee02a 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 15bcc477bdd..7b25f9fc5c7 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 67d3f32d53f..6f5c775cfb3 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 233ee0e6551..ee8876e6b33 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 89bce3ff99f..aa8b1b2b29f 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 c14f6080b8c..495f37de2f4 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 2faed53b7a5..7b55f39c119 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 3f536ec21c1..8caa86a71cb 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 589fbf49786..7987d26946d 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 0be1d4dc48d..66c0f039403 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 b6ec69ee388..1b8fb796bad 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 99f135c6d7b..7fc5ddbcce5 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 4db487f5c51..b0f8a2638c1 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 4db487f5c51..b0f8a2638c1 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 0f738eb9ccc..86ecd2c3345 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 890021b33d6..37d5cbe039f 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 330fac09862..6ee1735f76c 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 7728f7abcfc..6a86774226d 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 0428ccdc7f3..58f65a2709e 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 37f56a63806..026ab3fff1c 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 5e5cf311712..cdbf63dbd9f 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 cc6901c0384..868b5dbb342 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 b0819da4c6e..7d04d9e9fec 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 5f6112b53d0..4574b5a9b35 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 440ab624a62..5a82cf9d640 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 ce9e84fd572..8ddf784adc0 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 62b4d91de58..717d4012645 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 5c9e215f876..e736d561cb4 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 9784d369271..ea994c889e2 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 f189d2eb781..1b601992aa6 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 98abc0a3db7..145414e5c3d 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 14bc1ead49b..2dc909ca915 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 8d3645e3819..1eef323ae05 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 06bab807ebd..e3b042aa810 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 b20f862842c..69a0a7efde8 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 aa09b48ab27..f1de422fa24 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 1e7aa756471..d56f4bed0ce 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 131e85de5bf..2c6e04e049b 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 ebdb586bd47..439da366381 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 241c2ff2a13..59cd517b55c 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 4543fce4816..1b4563555c4 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 ff9e35d9216..956f8b07e98 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 981cf2a6703..629c10aecdf 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 a5c3466d57b..a43ec3b0eb9 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 63040b7fdd5..5552fadc555 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 4961bbeabfd..0e688e71a2e 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 7bfd8dff12e..91d8c122a8d 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 7cfe5f92736..4a268cac645 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 04ab9a5b5ab..6b17d7e8f50 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 92e9479d9a4..0713ff09e92 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 34a6bd7ceff..1f29b3aa1a1 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 5a92c103961..970daf739fc 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 129abef0b3d..7ac3831f6a5 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 4bf6e53737e..2126a4d76d6 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 5a51fe2136a..8443974a0a0 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 3211b6ebdc0..11b8f7ce535 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 15abc928f0f..87c047c2995 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 9f65bcb8c14..d15bed8476e 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 02b7017d295..0d3a12b38c2 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 baee2f23d4c..c8b388a06b7 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 dfc97eca8eb..5c5dfae8200 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 e6b2bb8787e..8d284176d44 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 e6b2bb8787e..8d284176d44 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 e89ba5ae36f..f400f1b8855 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 e89ba5ae36f..f400f1b8855 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 231670d263b..eeeb4a1d1e5 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 cd8a3b62269..65ff561ee9e 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 7b84dcecb63..325d2e77e1a 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 45860362433..44e9cd535be 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 795d43da6da..f22fbd102c7 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 a3b2a60953a..6371e504bfb 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 7d622c4067c..a933ae84e60 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 ef8bb1b4dcf..4b192605182 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 8d4a45a496c..a5e4eb8e280 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 70dd669e30f..cde31b5cef9 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 b4aa63ed014..91650deb077 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 a8ced15b58c..d5e7d1e7c83 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 6a0276d01e4..9929634921c 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 9ef9b678560..097bf4f49f4 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 81b33849887..5e6d1d8f942 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 5a2c6287c6f..9323a1cbd32 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 c73132b47bc..31edf87641b 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 23e2ab17477..58a2b29c259 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 d435f53e109..e0665909a8d 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 9dfe9c26c0d..f9adf6132f5 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 47ad4ec7aaf..db0b6e1037c 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 7329c48f41d..3613bb21ff6 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 d5705af5ce1..50655a851e2 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"; |