Browse Source

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

function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
nixos-19.03
Eelco Dolstra 11 years ago
parent
commit
c556a6ea46
  1. 12
      doc/stdenv.xml
  2. 6
      maintainers/docs/cross.txt
  3. 2
      pkgs/applications/audio/ardour/default.nix
  4. 2
      pkgs/applications/audio/gmu/default.nix
  5. 2
      pkgs/applications/audio/id3v2/default.nix
  6. 2
      pkgs/applications/audio/ladspa-plugins/default.nix
  7. 2
      pkgs/applications/audio/ladspa-plugins/ladspah.nix
  8. 4
      pkgs/applications/audio/mp3info/default.nix
  9. 2
      pkgs/applications/audio/mpc123/default.nix
  10. 2
      pkgs/applications/audio/snd/default.nix
  11. 2
      pkgs/applications/audio/sonic-visualiser/default.nix
  12. 2
      pkgs/applications/audio/vkeybd/default.nix
  13. 4
      pkgs/applications/audio/xsynth-dssi/default.nix
  14. 4
      pkgs/applications/editors/eclipse/default.nix
  15. 6
      pkgs/applications/editors/elvis/default.nix
  16. 2
      pkgs/applications/editors/emacs-modes/bbdb/default.nix
  17. 4
      pkgs/applications/editors/emacs-modes/cedet/default.nix
  18. 4
      pkgs/applications/editors/emacs-modes/ecb/default.nix
  19. 4
      pkgs/applications/editors/emacs-modes/emms/default.nix
  20. 2
      pkgs/applications/editors/emacs-modes/haskell/default.nix
  21. 2
      pkgs/applications/editors/emacs-modes/hol_light/default.nix
  22. 4
      pkgs/applications/editors/emacs-modes/jdee/default.nix
  23. 4
      pkgs/applications/editors/emacs-modes/org/default.nix
  24. 2
      pkgs/applications/editors/emacs-modes/quack/default.nix
  25. 2
      pkgs/applications/editors/emacs-modes/rudel/default.nix
  26. 2
      pkgs/applications/editors/emacs-modes/scala-mode/default.nix
  27. 2
      pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix
  28. 14
      pkgs/applications/editors/jedit/default.nix
  29. 2
      pkgs/applications/editors/jedit/wrapper.nix
  30. 2
      pkgs/applications/editors/nedit/builder.sh
  31. 4
      pkgs/applications/editors/nvi/default.nix
  32. 10
      pkgs/applications/graphics/gimp/plugins/default.nix
  33. 2
      pkgs/applications/graphics/hugin/default.nix
  34. 2
      pkgs/applications/graphics/jbrout/default.nix
  35. 2
      pkgs/applications/graphics/meshlab/default.nix
  36. 2
      pkgs/applications/graphics/minidjvu/default.nix
  37. 2
      pkgs/applications/graphics/pinta/default.nix
  38. 2
      pkgs/applications/graphics/rawtherapee/default.nix
  39. 2
      pkgs/applications/graphics/wings/default.nix
  40. 2
      pkgs/applications/graphics/xaos/default.nix
  41. 4
      pkgs/applications/misc/adobe-reader/builder.sh
  42. 2
      pkgs/applications/misc/audio/wavesurfer/default.nix
  43. 2
      pkgs/applications/misc/bitcoin/default.nix
  44. 2
      pkgs/applications/misc/blender/2.49.nix
  45. 2
      pkgs/applications/misc/freemind/default.nix
  46. 2
      pkgs/applications/misc/get_iplayer/default.nix
  47. 2
      pkgs/applications/misc/googleearth/default.nix
  48. 2
      pkgs/applications/misc/jbidwatcher/default.nix
  49. 2
      pkgs/applications/misc/makeself/default.nix
  50. 2
      pkgs/applications/misc/navipowm/default.nix
  51. 2
      pkgs/applications/misc/openjump/default.nix
  52. 2
      pkgs/applications/misc/procmail/default.nix
  53. 2
      pkgs/applications/misc/pstree/default.nix
  54. 2
      pkgs/applications/misc/qcad/default.nix
  55. 2
      pkgs/applications/misc/rxvt_unicode/default.nix
  56. 2
      pkgs/applications/misc/sbagen/default.nix
  57. 2
      pkgs/applications/misc/thinking-rock/default.nix
  58. 2
      pkgs/applications/misc/vue/default.nix
  59. 8
      pkgs/applications/misc/xpdf/libxpdf.nix
  60. 4
      pkgs/applications/networking/browsers/chromium/default.nix
  61. 2
      pkgs/applications/networking/browsers/firefox/wrapper.nix
  62. 2
      pkgs/applications/networking/browsers/icecat-3/default.nix
  63. 2
      pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
  64. 2
      pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
  65. 2
      pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
  66. 2
      pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
  67. 2
      pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
  68. 2
      pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
  69. 2
      pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
  70. 6
      pkgs/applications/networking/instant-messengers/oneteam/default.nix
  71. 2
      pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
  72. 6
      pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
  73. 4
      pkgs/applications/networking/instant-messengers/psi/default.nix
  74. 2
      pkgs/applications/networking/instant-messengers/psi/psimedia.nix
  75. 2
      pkgs/applications/networking/instant-messengers/torchat/default.nix
  76. 2
      pkgs/applications/networking/iptraf/default.nix
  77. 2
      pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
  78. 2
      pkgs/applications/networking/mumble/default.nix
  79. 2
      pkgs/applications/networking/offrss/default.nix
  80. 2
      pkgs/applications/networking/p2p/ldcpp/default.nix
  81. 2
      pkgs/applications/networking/p2p/mldonkey/default.nix
  82. 4
      pkgs/applications/networking/pjsip/default.nix
  83. 4
      pkgs/applications/networking/skype/default.nix
  84. 2
      pkgs/applications/networking/sync/unison/default.nix
  85. 2
      pkgs/applications/networking/vnstat/default.nix
  86. 2
      pkgs/applications/office/impressive/default.nix
  87. 2
      pkgs/applications/office/mmex/default.nix
  88. 4
      pkgs/applications/office/openoffice/builder.sh
  89. 2
      pkgs/applications/office/openoffice/get-go-src.nix
  90. 2
      pkgs/applications/office/openoffice/go-oo.nix
  91. 8
      pkgs/applications/science/biology/arb/default.nix
  92. 4
      pkgs/applications/science/biology/pal2nal/default.nix
  93. 2
      pkgs/applications/science/biology/slr/default.nix
  94. 2
      pkgs/applications/science/geometry/tetgen/default.nix
  95. 4
      pkgs/applications/science/logic/hol/default.nix
  96. 2
      pkgs/applications/science/logic/hol_light/default.nix
  97. 4
      pkgs/applications/science/logic/iprover/default.nix
  98. 2
      pkgs/applications/science/logic/isabelle/default.nix
  99. 6
      pkgs/applications/science/logic/leo2/default.nix
  100. 2
      pkgs/applications/science/logic/matita/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

12
doc/stdenv.xml

@ -70,7 +70,7 @@ stdenv.mkDerivation {
gcc foo.c -o foo
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp foo $out/bin
'';
}</programlisting>
@ -112,7 +112,7 @@ buildPhase() {
}
installPhase() {
ensureDir $out/bin
mkdir -p $out/bin
cp foo $out/bin
}
@ -939,14 +939,6 @@ functions.</para>
<variablelist>
<varlistentry xml:id='fun-ensureDir'>
<term><function>ensureDir</function> <replaceable>args</replaceable></term>
<listitem><para>Creates the specified directories, including all
necessary parent directories, if they do not already
exist.</para></listitem>
</varlistentry>
<varlistentry xml:id='fun-substitute'>
<term><function>substitute</function>
<replaceable>infile</replaceable>

6
maintainers/docs/cross.txt

@ -233,9 +233,9 @@ preConfigure() {
fi
# Cross compiler evilness
ensureDir $out
ensureDir $out/arm-linux
ensureDir $out/arm-linux/bin
mkdir -p $out
mkdir -p $out/arm-linux
mkdir -p $out/arm-linux/bin
ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as
ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld
ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar

2
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
'';

2
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
'';

2
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 = {

2
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
'';

2
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

4
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 = {

2
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"
'';

2
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"];

2
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

2
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
'';

4
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
'';

4
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
''; # */

6
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

2
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/

4
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"
'';

4
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"
'';

4
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 = {

2
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/"
'';

2
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
'';

4
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

4
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"
'';

2
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"
'';

2
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"

2
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"
'';

2
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/"
'';

14
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
'';

2
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 \\$*

2
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
}

4
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

10
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
";

2
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
'';

2
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

2
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

2
pkgs/applications/graphics/minidjvu/default.nix

@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ libtiff gettext];
preInstall = ''
ensureDir $out/lib
mkdir -p $out/lib
'';
meta = {

2
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

2
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

2
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

2
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;

4
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

2
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

2
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
'';

2
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
'';

2
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

2
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
'';

2
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

2
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}"

2
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/

2
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}

2
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-*)

2
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

2
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";

2
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

2
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}
'';

2
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

2
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

2
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"

8
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

4
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

2
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
'';

2
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/"
'';

2
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
}

2
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
}

2
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
}

2
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"];

2
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
'';

2
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 {})

2
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 {})

6
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"];

2
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];