public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
This commit is contained in:
Eelco Dolstra 2012-01-18 20:16:00 +00:00
parent f7159c195a
commit c556a6ea46
629 changed files with 931 additions and 939 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/stdenv.xml
View File

@ -70,7 +70,7 @@ stdenv.mkDerivation {
gcc foo.c -o foo gcc foo.c -o foo
''; '';
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp foo $out/bin cp foo $out/bin
''; '';
}</programlisting> }</programlisting>
@ -112,7 +112,7 @@ buildPhase() {
} }
installPhase() { installPhase() {
ensureDir $out/bin mkdir -p $out/bin
cp foo $out/bin cp foo $out/bin
} }
@ -939,14 +939,6 @@ functions.</para>
<variablelist> <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'> <varlistentry xml:id='fun-substitute'>
<term><function>substitute</function> <term><function>substitute</function>
<replaceable>infile</replaceable> <replaceable>infile</replaceable>

6
maintainers/docs/cross.txt
View File

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

2
pkgs/applications/audio/ardour/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
]; ];
buildPhase = '' buildPhase = ''
ensureDir $out mkdir -p $out
export CXX=g++ export CXX=g++
scons PREFIX=$out install scons PREFIX=$out install
''; '';

2
pkgs/applications/audio/gmu/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
cp ${keymap}.keymap $out/share/gmu/default.keymap cp ${keymap}.keymap $out/share/gmu/default.keymap
cp gmuinput.${conf}.conf $out/share/gmu/gmuinput.conf 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 cp gmu.${conf}.conf $out/etc/gmu/gmu.conf
''; '';

2
pkgs/applications/audio/id3v2/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
''; '';
preInstall = '' preInstall = ''
ensureDir $out/bin $out/man/man1 mkdir -p $out/bin $out/man/man1
''; '';
meta = { meta = {

2
pkgs/applications/audio/ladspa-plugins/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
postInstall = postInstall =
'' ''
ensureDir $out/share/ladspa/ mkdir -p $out/share/ladspa/
ln -sv $out/lib/ladspa $out/share/ladspa/lib ln -sv $out/lib/ladspa $out/share/ladspa/lib
''; '';

2
pkgs/applications/audio/ladspa-plugins/ladspah.nix
View File

@ -13,7 +13,7 @@ in
in with localDefs; in with localDefs;
let let
copyFile = fullDepEntry (" copyFile = fullDepEntry ("
ensureDir \$out/include mkdir -p \$out/include
cp ${src} \$out/include/ladspa.h cp ${src} \$out/include/ladspa.h
") [minInit defEnsureDir]; ") [minInit defEnsureDir];
in in

4
pkgs/applications/audio/mp3info/default.nix
View File

@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
''; '';
preInstall = preInstall =
'' ensureDir "$out/bin" '' mkdir -p "$out/bin"
ensureDir "$out/man/man1" mkdir -p "$out/man/man1"
''; '';
meta = { meta = {

2
pkgs/applications/audio/mpc123/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
installPhase = installPhase =
# XXX: Should install locales too (though there's only 1 available). # XXX: Should install locales too (though there's only 1 available).
'' ensureDir "$out/bin" '' mkdir -p "$out/bin"
cp -v mpc123 "$out/bin" cp -v mpc123 "$out/bin"
''; '';

2
pkgs/applications/audio/snd/default.nix
View File

@ -40,7 +40,7 @@ rec {
makeDocsWork = fullDepEntry '' makeDocsWork = fullDepEntry ''
# hackish way to make html docs work # 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} patch -p1 < ${./doc.patch}
sed "s@HTML-DIR@$h@" -i index.scm snd-help.c sed "s@HTML-DIR@$h@" -i index.scm snd-help.c
'' ["defEnsureDir"]; '' ["defEnsureDir"];

2
pkgs/applications/audio/sonic-visualiser/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/{bin,share/sonic-visualiser} mkdir -p $out/{bin,share/sonic-visualiser}
cp sonic-visualiser/sonic-visualiser $out/bin cp sonic-visualiser/sonic-visualiser $out/bin
cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples cp -r sonic-visualiser/samples $out/share/sonic-visualiser/samples
wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib wrapProgram $out/bin/sonic-visualiser --prefix LD_LIBRARY_PATH : ${libX11}/lib

2
pkgs/applications/audio/vkeybd/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ alsaLib libX11 makeWrapper tcl tk ]; buildInputs = [ alsaLib libX11 makeWrapper tcl tk ];
configurePhase = '' configurePhase = ''
ensureDir $out/bin mkdir -p $out/bin
sed -e "s@/usr/local@$out@" -i Makefile sed -e "s@/usr/local@$out@" -i Makefile
''; '';

4
pkgs/applications/audio/xsynth-dssi/default.nix
View File

@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
ladspaPlugins liblo pkgconfig ]; ladspaPlugins liblo pkgconfig ];
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
ensureDir $out/lib mkdir -p $out/lib
cp src/Xsynth_gtk $out/bin cp src/Xsynth_gtk $out/bin
cp src/.libs/* $out/lib cp src/.libs/* $out/lib
''; '';

4
pkgs/applications/editors/eclipse/default.nix
View File

@ -27,7 +27,7 @@ let
buildCommand = '' buildCommand = ''
# Unpack tarball. # Unpack tarball.
ensureDir $out mkdir -p $out
tar xfvz $src -C $out tar xfvz $src -C $out
# Patch binaries. # Patch binaries.
@ -47,7 +47,7 @@ let
--add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
# Create desktop item. # Create desktop item.
ensureDir $out/share/applications mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications cp ${desktopItem}/share/applications/* $out/share/applications
''; # */ ''; # */

6
pkgs/applications/editors/elvis/default.nix
View File

@ -15,16 +15,16 @@ stdenv.mkDerivation rec {
''; '';
preConfigure = '' preConfigure = ''
ensureDir $out/share/man/man1 mkdir -p $out/share/man/man1
''; '';
installPhase = '' 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 elvis ref elvtags elvfmt $out/bin
cp -R data/* $out/share/elvis cp -R data/* $out/share/elvis
cp doc/* $out/share/elvis/doc cp doc/* $out/share/elvis/doc
ensureDir $out/share/man/man1 mkdir -p $out/share/man/man1
for a in doc/*.man; do for a in doc/*.man; do
cp $a $out/share/man/man1/`basename $a .man`.1 cp $a $out/share/man/man1/`basename $a .man`.1
done done

2
pkgs/applications/editors/emacs-modes/bbdb/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [emacs texinfo ctags]; buildInputs = [emacs texinfo ctags];
configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp";
preInstall = "ensureDir $out/info"; preInstall = "mkdir -p $out/info";
installTargets = "install-pkg texinfo"; installTargets = "install-pkg texinfo";
postInstall = '' postInstall = ''
mv $out/info $out/share/ mv $out/info $out/share/

4
pkgs/applications/editors/emacs-modes/cedet/default.nix
View File

@ -14,11 +14,11 @@ stdenv.mkDerivation rec {
checkPhase = "make utest"; checkPhase = "make utest";
installPhase = '' 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" cp -v */*.el */*/*.el */*.elc */*/*.elc "$out/share/emacs/site-lisp"
chmod a-x "$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" cp -v */*.info* */*/*.info* "$out/share/info"
''; '';

4
pkgs/applications/editors/emacs-modes/ecb/default.nix
View File

@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' 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" 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" cp -v info-help/*.info* "$out/share/info"
''; '';

4
pkgs/applications/editors/emacs-modes/emms/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
s|/usr/include/taglib|${taglib}/include/taglib|g ; s|/usr/include/taglib|${taglib}/include/taglib|g ;
s|/usr/lib|${taglib}/lib|g ; s|/usr/lib|${taglib}/lib|g ;
s|^all:\(.*\)\$|all:\1 emms-print-metadata|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" \ 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' -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 = '' postInstall = ''
ensureDir "$out/bin" && cp emms-print-metadata "$out/bin" mkdir -p "$out/bin" && cp emms-print-metadata "$out/bin"
''; '';
meta = { meta = {

2
pkgs/applications/editors/emacs-modes/haskell/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [emacs]; buildInputs = [emacs];
installPhase = '' installPhase = ''
ensureDir "$out/share/emacs/site-lisp" mkdir -p "$out/share/emacs/site-lisp"
cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" cp *.el *.elc *.hs "$out/share/emacs/site-lisp/"
''; '';

2
pkgs/applications/editors/emacs-modes/hol_light/default.nix
View File

@ -15,7 +15,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
DEST=$out/share/emacs/site-lisp DEST=$out/share/emacs/site-lisp
ensureDir $DEST mkdir -p $DEST
cp -a * $DEST cp -a * $DEST
''; '';

4
pkgs/applications/editors/emacs-modes/jdee/default.nix
View File

@ -23,7 +23,7 @@ in
]; ];
configurePhase = '' configurePhase = ''
ensureDir "dist" mkdir -p "dist"
cat > build.properties <<EOF cat > build.properties <<EOF
dist.lisp.dir = dist/share/emacs/site-lisp dist.lisp.dir = dist/share/emacs/site-lisp
dist.java.lib.dir = dist/lib/java dist.java.lib.dir = dist/lib/java
@ -50,7 +50,7 @@ in
installPhase = '' installPhase = ''
ant install ant install
ensureDir "$out/share/${name}" mkdir -p "$out/share/${name}"
cp -rv java/bsh-commands "$out/share/${name}" cp -rv java/bsh-commands "$out/share/${name}"
# Move everything that's not a JAR to $datadir. This includes # Move everything that's not a JAR to $datadir. This includes

4
pkgs/applications/editors/emacs-modes/org/default.nix
View File

@ -29,10 +29,10 @@ stdenv.mkDerivation rec {
installPhase = installPhase =
'' make install install-info '' 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}" 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" cp -R contrib "$out/share/org/contrib"
''; '';

2
pkgs/applications/editors/emacs-modes/quack/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildPhase = '' buildPhase = ''
emacsDir="$out/share/emacs/site-lisp" emacsDir="$out/share/emacs/site-lisp"
ensureDir "$emacsDir" mkdir -p "$emacsDir"
cp -v "$src" "$emacsDir/quack.el" cp -v "$src" "$emacsDir/quack.el"
emacs --batch -f batch-byte-compile "$emacsDir/quack.el" emacs --batch -f batch-byte-compile "$emacsDir/quack.el"
''; '';

2
pkgs/applications/editors/emacs-modes/rudel/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation
installPhase = '' installPhase = ''
for n in . obby zeroconf jupiter; do 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/"; cp $n/*.el "$out/share/emacs/site-lisp/$n/";
done done
install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf" install -D -m444 doc/card.pdf "$out/share/doc/rudel/card.pdf"

2
pkgs/applications/editors/emacs-modes/scala-mode/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ emacs ]; buildInputs = [ emacs ];
installPhase = installPhase =
'' ensureDir "$out/share/emacs/site-lisp" '' mkdir -p "$out/share/emacs/site-lisp"
cp -v *.el *.elc "$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
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
buildInputs = [emacs]; buildInputs = [emacs];
installPhase = '' installPhase = ''
ensureDir "$out/share/emacs/site-lisp" mkdir -p "$out/share/emacs/site-lisp"
cp lisp/*.el "$out/share/emacs/site-lisp/" cp lisp/*.el "$out/share/emacs/site-lisp/"
''; '';

14
pkgs/applications/editors/jedit/default.nix
View File

@ -17,19 +17,19 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/share/jEdit mkdir -p $out/share/jEdit
cp build/jedit.jar $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 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 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 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 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 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 mv package-files/linux/deb/jedit.desktop $out/share/applications/jedit.desktop
patch package-files/linux/jedit << EOF patch package-files/linux/jedit << EOF
@ -39,7 +39,7 @@ stdenv.mkDerivation {
> >
EOF EOF
sed -i "s|/usr/share/jEdit/@jar.filename@|$out/share/jEdit/jedit.jar|g" package-files/linux/jedit 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 cp package-files/linux/jedit $out/bin/jedit
chmod +x $out/bin/jedit chmod +x $out/bin/jedit
''; '';

2
pkgs/applications/editors/jedit/wrapper.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
phases = "buildPhase"; phases = "buildPhase";
buildPhase = " buildPhase = "
ensureDir \$out/bin mkdir -p \$out/bin
cat > \$out/bin/${jedit.name} << EOF cat > \$out/bin/${jedit.name} << EOF
#!/bin/sh #!/bin/sh
exec $java -jar $jeditjar \\$* exec $java -jar $jeditjar \\$*

2
pkgs/applications/editors/nedit/builder.sh
View File

@ -3,7 +3,7 @@ source $stdenv/setup
export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE" export NIX_CFLAGS_COMPILE="-DBUILD_UNTESTED_NEDIT -L$motif/lib $NIX_CFLAGS_COMPILE"
installPhase() { installPhase() {
ensureDir $out/bin mkdir -p $out/bin
cp -p source/nedit source/nc $out/bin cp -p source/nedit source/nc $out/bin
} }

4
pkgs/applications/editors/nvi/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' 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 for a in dutch english french german ru_SU.KOI8-R spanish swedish; do
cp ../catalog/$a $out/share/vi/catalog cp ../catalog/$a $out/share/vi/catalog
done done
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
ln -s $out/bin/nvi $out/bin/ex ln -s $out/bin/nvi $out/bin/ex
ln -s $out/bin/nvi $out/bin/view 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 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/vi
ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex ln -s $out/share/man/man1/nvi.1 $out/share/man/man1/ex

10
pkgs/applications/graphics/gimp/plugins/default.nix
View File

@ -15,11 +15,11 @@ let
prePhases = "extraLib"; prePhases = "extraLib";
extraLib = '' extraLib = ''
installScripts(){ installScripts(){
ensureDir ${targetScriptDir}; mkdir -p ${targetScriptDir};
for p in "$@"; do cp "$p" ${targetScriptDir}; done for p in "$@"; do cp "$p" ${targetScriptDir}; done
} }
installPlugins(){ installPlugins(){
ensureDir ${targetPluginDir}; mkdir -p ${targetPluginDir};
for p in "$@"; do cp "$p" ${targetPluginDir}; done 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; url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; 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"; installPhase = "installPlugins src/gimp-lqr-plugin";
}; };
@ -190,7 +190,7 @@ rec {
}; };
installPhase = " installPhase = "
installPlugins ufraw-gimp installPlugins ufraw-gimp
ensureDir $out/bin mkdir -p $out/bin
cp ufraw $out/bin cp ufraw $out/bin
"; ";
}; };
@ -209,7 +209,7 @@ rec {
installPhase = " installPhase = "
installPlugins gimplensfun installPlugins gimplensfun
ensureDir $out/bin mkdir -p $out/bin
cp gimplensfun $out/bin cp gimplensfun $out/bin
"; ";

2
pkgs/applications/graphics/hugin/default.nix
View File

@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ]; exiv2 gettext ilmbase mesa freeglut glew libXmu libXi ];
postInstall = '' postInstall = ''
ensureDir "$out/nix-support" mkdir -p "$out/nix-support"
echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages echo "${enblendenfuse} ${autopanosiftc}" > $out/nix-support/propagated-user-env-packages
''; '';

2
pkgs/applications/graphics/jbrout/default.nix
View File

@ -20,7 +20,7 @@ buildPythonPackage {
''; '';
postInstall = '' postInstall = ''
ensureDir $out/bin mkdir -p $out/bin
echo '#!/bin/sh' > $out/bin/jbrout 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 echo "python $out/lib/python2.7/site-packages/jbrout-src-py2.7.egg/jbrout/jbrout.py" >> $out/bin/jbrout
chmod +x $out/bin/jbrout chmod +x $out/bin/jbrout

2
pkgs/applications/graphics/meshlab/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/opt/meshlab $out/bin $out/lib mkdir -p $out/opt/meshlab $out/bin $out/lib
pushd distrib pushd distrib
cp -R * $out/opt/meshlab cp -R * $out/opt/meshlab
popd popd

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

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

2
pkgs/applications/graphics/pinta/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation {
# Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries? # Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries?
installPhase = '' installPhase = ''
ensureDir $out/lib/pinta $out/bin mkdir -p $out/lib/pinta $out/bin
cp bin/*.{dll,exe} $out/lib/pinta cp bin/*.{dll,exe} $out/lib/pinta
cat > $out/bin/pinta << EOF cat > $out/bin/pinta << EOF
#!/bin/sh #!/bin/sh

2
pkgs/applications/graphics/rawtherapee/default.nix
View File

@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ "-DWITH_RAWZOR=OFF" ]; cmakeFlags = [ "-DWITH_RAWZOR=OFF" ];
installPhase = '' installPhase = ''
ensureDir $out/bin $out/lib mkdir -p $out/bin $out/lib
cp rtgui/rt $out/bin cp rtgui/rt $out/bin
# Weird kind of path reference # Weird kind of path reference
cp -r ../release/* $out/bin cp -r ../release/* $out/bin

2
pkgs/applications/graphics/wings/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
buildInputs = [ erlang esdl ]; buildInputs = [ erlang esdl ];
installPhase = '' installPhase = ''
ensureDir $out/bin $out/lib/${name}/ebin mkdir -p $out/bin $out/lib/${name}/ebin
cp ebin/* $out/lib/${name}/ebin cp ebin/* $out/lib/${name}/ebin
cp -R fonts textures shaders plugins $out/lib/$name cp -R fonts textures shaders plugins $out/lib/$name
cat << EOF > $out/bin/wings cat << EOF > $out/bin/wings

2
pkgs/applications/graphics/xaos/default.nix
View File

@ -22,7 +22,7 @@ rec {
preConfigure = a.fullDepEntry ('' preConfigure = a.fullDepEntry (''
sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*') sed -e s@/usr/@"$out/"@g -i configure $(find . -name 'Makefile*')
ensureDir $out/share/locale mkdir -p $out/share/locale
'') ["doUnpack" "minInit" "defEnsureDir"]; '') ["doUnpack" "minInit" "defEnsureDir"];
name = "xaos-" + version; name = "xaos-" + version;

4
pkgs/applications/misc/adobe-reader/builder.sh
View File

@ -3,7 +3,7 @@ source $stdenv/setup
echo "unpacking $src..." echo "unpacking $src..."
tar xvfa $src tar xvfa $src
ensureDir $out/Adobe/Reader9 mkdir -p $out/Adobe/Reader9
echo "unpacking reader..." echo "unpacking reader..."
set +e set +e
@ -24,5 +24,5 @@ substituteInPlace $out/Adobe/Reader*/bin/acroread \
--replace /bin/ls $(type -P ls) \ --replace /bin/ls $(type -P ls) \
--replace xargs "xargs -r" --replace xargs "xargs -r"
ensureDir $out/bin mkdir -p $out/bin
ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread ln -s $out/Adobe/Reader*/bin/acroread $out/bin/acroread

2
pkgs/applications/misc/audio/wavesurfer/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation {
buildInputs = [ snack tcl tk makeWrapper ]; buildInputs = [ snack tcl tk makeWrapper ];
installPhase = '' installPhase = ''
ensureDir $out/{bin,nix-support,share/wavesurfer/} mkdir -p $out/{bin,nix-support,share/wavesurfer/}
mv doc $out/share/wavesurfer mv doc $out/share/wavesurfer
mv * $out/nix-support mv * $out/nix-support
ln -s $out/{nix-support,bin}/wavesurfer.tcl ln -s $out/{nix-support,bin}/wavesurfer.tcl

2
pkgs/applications/misc/bitcoin/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp bitcoin-qt $out/bin cp bitcoin-qt $out/bin
cp src/bitcoind $out/bin cp src/bitcoind $out/bin
''; '';

2
pkgs/applications/misc/blender/2.49.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2"; NIX_CFLAGS_COMPILE = "-iquote ${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix} -I${freetype}/include/freetype2";
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp bin/* $out/bin cp bin/* $out/bin
''; '';

2
pkgs/applications/misc/freemind/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation {
# JDK 7 beta seems to have fixed this (bug ?) # JDK 7 beta seems to have fixed this (bug ?)
installPhase = '' installPhase = ''
ensureDir $out/{bin,nix-support} mkdir -p $out/{bin,nix-support}
cp -r ../bin/dist $out/nix-support cp -r ../bin/dist $out/nix-support
sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh sed -i 's/which/type -p/' $out/nix-support/dist/freemind.sh
cat > $out/bin/freemind << EOF cat > $out/bin/freemind << EOF

2
pkgs/applications/misc/get_iplayer/default.nix
View File

@ -6,7 +6,7 @@ stdenv.mkDerivation {
buildInputs = [makeWrapper perl]; buildInputs = [makeWrapper perl];
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp get_iplayer $out/bin cp get_iplayer $out/bin
wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin wrapProgram $out/bin/get_iplayer --suffix PATH ${ffmpeg}/bin:${flvstreamer}/bin
''; '';

2
pkgs/applications/misc/googleearth/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation {
''; '';
installPhase ='' installPhase =''
ensureDir $out/{opt/googleearth/,bin}; mkdir -p $out/{opt/googleearth/,bin};
tar xf googleearth-data.tar -C $out/opt/googleearth tar xf googleearth-data.tar -C $out/opt/googleearth
tar xf googleearth-linux-x86.tar -C $out/opt/googleearth tar xf googleearth-linux-x86.tar -C $out/opt/googleearth
cp bin/googleearth $out/opt/googleearth cp bin/googleearth $out/opt/googleearth

2
pkgs/applications/misc/jbidwatcher/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildPhase = "true"; buildPhase = "true";
installPhase = '' installPhase = ''
ensureDir "$out/bin" mkdir -p "$out/bin"
echo > "$out/bin/${pname}" "#!/bin/sh" echo > "$out/bin/${pname}" "#!/bin/sh"
echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}" echo >>"$out/bin/${pname}" "${java}/bin/java -Xmx512m -jar ${jarfile}"
chmod +x "$out/bin/${pname}" chmod +x "$out/bin/${pname}"

2
pkgs/applications/misc/makeself/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
unpackPhase = "sh ${src}"; unpackPhase = "sh ${src}";
installPhase = '' installPhase = ''
cd ${name} 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.lsm README $out/share/${name}
mv makeself.sh $out/bin/makeself mv makeself.sh $out/bin/makeself
mv makeself.1 $out/share/man/man1/ mv makeself.1 $out/share/man/man1/

2
pkgs/applications/misc/navipowm/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/bin $out/share/${name}/Icons mkdir -p $out/bin $out/share/${name}/Icons
cp bin/NaviPOWM $out/bin cp bin/NaviPOWM $out/bin
cp ../../common/Config/navipowm.ini $out/share/${name} cp ../../common/Config/navipowm.ini $out/share/${name}
cp ../../common/Images/* $out/share/${name} cp ../../common/Images/* $out/share/${name}

2
pkgs/applications/misc/openjump/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
# error. Still this is better than getting it always. # error. Still this is better than getting it always.
# TODO: build from source and patch this # TODO: build from source and patch this
unpackPhase = '' unpackPhase = ''
ensureDir $out/bin; mkdir -p $out/bin;
cd $out; unzip $src cd $out; unzip $src
s=$out/bin/OpenJump s=$out/bin/OpenJump
dir=$(echo $out/openjump-*) dir=$(echo $out/openjump-*)

2
pkgs/applications/misc/procmail/default.nix
View File

@ -7,7 +7,7 @@ stdenv.mkDerivation {
# getline is defined differently in glibc now. So rename it. # getline is defined differently in glibc now. So rename it.
installPhase = " 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%^RM.*$%RM=`type -f rm | awk '{print $3;}'` -f%\" -i Makefile
sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile
sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile

2
pkgs/applications/misc/pstree/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
unpackPhase = "unpackFile \$src; sourceRoot=."; unpackPhase = "unpackFile \$src; sourceRoot=.";
buildPhase = "pwd; gcc -o pstree pstree.c"; 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 = { meta = {
description = "Show the set of running processes as a tree"; description = "Show the set of running processes as a tree";

2
pkgs/applications/misc/qcad/default.nix
View File

@ -32,7 +32,7 @@ stdenv.mkDerivation {
# probably there is more to be done. But this seems to work for now (eg see gentoo ebuild) # probably there is more to be done. But this seems to work for now (eg see gentoo ebuild)
installPhase = '' installPhase = ''
ensureDir $out/{bin,share} mkdir -p $out/{bin,share}
cp -r qcad $out/share cp -r qcad $out/share
# The compilation does not fail with error code. But qcad will not exist # The compilation does not fail with error code. But qcad will not exist

2
pkgs/applications/misc/rxvt_unicode/default.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
'' ''
# make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically # make urxvt find its perl file lib/perl5/site_perl is added to PERL5LIB automatically
+ stdenv.lib.optionalString perlSupport '' + stdenv.lib.optionalString perlSupport ''
ensureDir $out/lib/perl5 mkdir -p $out/lib/perl5
ln -s $out/{lib/urxvt,lib/perl5/site_perl} ln -s $out/{lib/urxvt,lib/perl5/site_perl}
''; '';

2
pkgs/applications/misc/sbagen/default.nix
View File

@ -8,7 +8,7 @@ stdenv.mkDerivation {
buildPhase = "./mk"; buildPhase = "./mk";
installPhase = '' 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 -r --target-directory=$out/share/sbagen examples scripts river1.ogg river2.ogg
cp sbagen $out/bin cp sbagen $out/bin
cp --target-directory=$out/share/sbagen/doc README.txt SBAGEN.txt theory{,2}.txt {wave,holosync,focus,TODO}.txt 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
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation {
ls -1 bin/* | grep -ve 'bin/tr''$' | xargs rm ls -1 bin/* | grep -ve 'bin/tr''$' | xargs rm
# don't keep the other .exe file either # don't keep the other .exe file either
find . -iname "*.exe" | xargs -n1 rm 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 cp -r . $out/nix-support/tr-files
cat >> $out/bin/thinkingrock << EOF cat >> $out/bin/thinkingrock << EOF
#!/bin/sh #!/bin/sh

2
pkgs/applications/misc/vue/default.nix
View File

@ -31,7 +31,7 @@ rec {
doDeploy = a.fullDepEntry '' doDeploy = a.fullDepEntry ''
unzip ${src} unzip ${src}
ensureDir "$out"/{share/vue,bin} mkdir -p "$out"/{share/vue,bin}
cp VUE.jar "$out/share/vue/vue.jar" cp VUE.jar "$out/share/vue/vue.jar"
echo '#!${a.stdenv.shell}' >> "$out/bin/vue" echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue" echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"

8
pkgs/applications/misc/xpdf/libxpdf.nix
View File

@ -31,10 +31,10 @@ stdenv.mkDerivation {
]; ];
installPhase = '' installPhase = ''
ensureDir $out/lib/goo mkdir -p $out/lib/goo
ensureDir $out/lib/fofi mkdir -p $out/lib/fofi
ensureDir $out/lib/xpdf mkdir -p $out/lib/xpdf
ensureDir $out/include mkdir -p $out/include
cp -v goo/libGoo.a $out/lib/goo cp -v goo/libGoo.a $out/lib/goo
cp -v fofi/libfofi.a $out/lib/fofi cp -v fofi/libfofi.a $out/lib/fofi

4
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -42,8 +42,8 @@ stdenv.mkDerivation rec {
]; ];
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
ensureDir $out/libexec/chrome mkdir -p $out/libexec/chrome
cp -R * $out/libexec/chrome cp -R * $out/libexec/chrome

2
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -30,7 +30,7 @@ stdenv.mkDerivation {
--suffix-each LD_LIBRARY_PATH ':' "$libs" \ --suffix-each LD_LIBRARY_PATH ':' "$libs" \
--prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" --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 cp $desktopItem/share/applications/* $out/share/applications
''; '';

2
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -84,7 +84,7 @@ stdenv.mkDerivation {
fi fi
# Put the GNU IceCat icon in the right place. # 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/" ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/"
''; '';

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/builder.sh
View File

@ -15,7 +15,7 @@ unpackPhase() {
} }
installPhase() { installPhase() {
ensureDir $out/lib/mozilla/plugins mkdir -p $out/lib/mozilla/plugins
cp -pv libflashplayer.so $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
} }

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/builder.sh
View File

@ -15,7 +15,7 @@ unpackPhase() {
} }
installPhase() { installPhase() {
ensureDir $out/lib/mozilla/plugins mkdir -p $out/lib/mozilla/plugins
cp -pv libflashplayer.so $out/lib/mozilla/plugins cp -pv libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
} }

2
pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-9/builder.sh
View File

@ -6,7 +6,7 @@ dontPatchELF=1
sourceRoot=. sourceRoot=.
installPhase() { installPhase() {
ensureDir $out/lib/mozilla/plugins mkdir -p $out/lib/mozilla/plugins
cp -p libflashplayer.so $out/lib/mozilla/plugins cp -p libflashplayer.so $out/lib/mozilla/plugins
patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so patchelf --set-rpath $rpath $out/lib/mozilla/plugins/libflashplayer.so
} }

2
pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix
View File

@ -22,7 +22,7 @@ rec {
'') ["doUnpack" "minInit"]; '') ["doUnpack" "minInit"];
postInstall = a.fullDepEntry('' 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 ln -s $out/lib/mozilla/plugins/mozplugger.so $out/share/${name}/plugin
'') ["doMakeInstall" "minInit" "defEnsureDir"]; '') ["doMakeInstall" "minInit" "defEnsureDir"];

2
pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ]; buildInputs = [ pkgconfig browser (browser.gtk) libXpm gettext ];
installPhase = '' installPhase = ''
ensureDir $out/lib/mozilla/plugins mkdir -p $out/lib/mozilla/plugins
cp -p mplayerplug-in*.so mplayerplug-in*.xpt $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
View File

@ -46,7 +46,7 @@ rec {
}; };
} // (if externalPurple2 then { } // (if externalPurple2 then {
postInstall = fullDepEntry ('' postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2 mkdir -p $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; } '') ["minInit" "defEnsureDir"]; }
else {}) else {})

2
pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
View File

@ -46,7 +46,7 @@ rec {
}; };
} // (if externalPurple2 then { } // (if externalPurple2 then {
postInstall = fullDepEntry ('' postInstall = fullDepEntry (''
ensureDir $out/lib/purple-2 mkdir -p $out/lib/purple-2
cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/ cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
'') ["minInit" "defEnsureDir"]; } '') ["minInit" "defEnsureDir"]; }
else {}) else {})

6
pkgs/applications/networking/instant-messengers/oneteam/default.nix
View File

@ -59,14 +59,14 @@ rec {
doDeploy = a.fullDepEntry '' doDeploy = a.fullDepEntry ''
TARGET_DIR="$out/share/oneteam/app" TARGET_DIR="$out/share/oneteam/app"
BUILD_DIR="$PWD" BUILD_DIR="$PWD"
ensureDir "$TARGET_DIR" mkdir -p "$TARGET_DIR"
cd "$TARGET_DIR" cd "$TARGET_DIR"
unzip "$BUILD_DIR/oneteam.xulapp" unzip "$BUILD_DIR/oneteam.xulapp"
ensureDir "$out/bin" mkdir -p "$out/bin"
echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam" echo "#! ${a.stdenv.shell}" > "$out/bin/oneteam"
echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam" echo "\"${xulrunner}/bin/xulrunner\" \"$TARGET_DIR/application.ini\"" > "$out/bin/oneteam"
chmod a+x "$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" cp -r "$BUILD_DIR/docs" "$out/share/doc/oneteam"
'' ["defEnsureDir"]; '' ["defEnsureDir"];

2
pkgs/applications/networking/instant-messengers/pidgin-plugins/msn-pecan/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation {
}; };
makeFlags = "PURPLE_LIBDIR=lib PURPLE_DATADIR=share/data DESTDIR=$$out"; 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"; postInstall = "ln -s \$out/lib/purple-2 \$out/share/pidgin-msn-pecan";
buildInputs = [pidgin]; buildInputs = [pidgin];

6
pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix
View File

@ -12,7 +12,7 @@ rec {
]; ];
preBuild = fullDepEntry ('' preBuild = fullDepEntry (''
ensureDir $out/bin mkdir -p $out/bin
ln -s $(which convert) $out/bin ln -s $(which convert) $out/bin
ln -s $(which xelatex) $out/bin ln -s $(which xelatex) $out/bin
ln -s $(which dvips) $out/bin ln -s $(which dvips) $out/bin
@ -26,8 +26,8 @@ rec {
'') ["minInit" "addInputs" "defEnsureDir" "doUnpack"]; '') ["minInit" "addInputs" "defEnsureDir" "doUnpack"];
postInstall = fullDepEntry ('' postInstall = fullDepEntry (''
ensureDir $out/lib mkdir -p $out/lib
ensureDir $out/share/pidgin-latex mkdir -p $out/share/pidgin-latex
ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex ln -s ../../lib/pidgin/LaTeX.so $out/share/pidgin-latex
'') ["minInit" "defEnsureDir" "doMakeInstall"]; '') ["minInit" "defEnsureDir" "doMakeInstall"];

4
pkgs/applications/networking/instant-messengers/psi/default.nix
View File

@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
PSI_PLUGINS="$out/lib/psi/plugins" PSI_PLUGINS="$out/lib/psi/plugins"
ensureDir "$PSI_PLUGINS" mkdir -p "$PSI_PLUGINS"
ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS" ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS"
PSI_QT_PLUGINS="$out/share/psi" 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 ln -s "${qca2_ossl}"/lib/qt4/plugins/crypto/*.so "$PSI_QT_PLUGINS"/crypto
''; '';

2
pkgs/applications/networking/instant-messengers/psi/psimedia.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
postBuild = '' postBuild = ''
TARGET="$out/share/psi/plugins" TARGET="$out/share/psi/plugins"
ensureDir "$TARGET" mkdir -p "$TARGET"
cp gstprovider/*.so "$TARGET"/ cp gstprovider/*.so "$TARGET"/
''; '';

2
pkgs/applications/networking/instant-messengers/torchat/default.nix
View File

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
wrapPythonPrograms wrapPythonPrograms
ensureDir $out/lib/torchat mkdir -p $out/lib/torchat
cp -rf * $out/lib/torchat cp -rf * $out/lib/torchat
makeWrapper ${python}/bin/python $out/bin/torchat \ makeWrapper ${python}/bin/python $out/bin/torchat \
--set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \ --set PYTHONPATH $out/lib/torchat:$program_PYTHONPATH \

2
pkgs/applications/networking/iptraf/default.nix
View File

@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
preConfigure = "cd src"; preConfigure = "cd src";
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp iptraf $out/bin cp iptraf $out/bin
''; '';

2
pkgs/applications/networking/mailreaders/thunderbird/9.x.nix
View File

@ -90,7 +90,7 @@ stdenv.mkDerivation {
--replace /bin/ls "$(type -tP ls)" --replace /bin/ls "$(type -tP ls)"
# Create a desktop item. # Create a desktop item.
ensureDir $out/share/applications mkdir -p $out/share/applications
cat > $out/share/applications/thunderbird.desktop <<EOF cat > $out/share/applications/thunderbird.desktop <<EOF
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application

2
pkgs/applications/networking/mumble/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional jackSupport jackaudio); ++ (stdenv.lib.optional jackSupport jackaudio);
installPhase = '' installPhase = ''
ensureDir $out mkdir -p $out
cp -r ./release $out/bin cp -r ./release $out/bin
''; '';

2
pkgs/applications/networking/offrss/default.nix
View File

@ -4,7 +4,7 @@ stdenv.mkDerivation {
name = "offrss-1.1"; name = "offrss-1.1";
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp offrss $out/bin cp offrss $out/bin
''; '';

2
pkgs/applications/networking/p2p/ldcpp/default.nix
View File

@ -12,7 +12,7 @@ with builderDefs;
openssl libX11 boost]; openssl libX11 boost];
configureFlags = []; configureFlags = [];
doScons = fullDepEntry ('' doScons = fullDepEntry (''
ensureDir $out mkdir -p $out
export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
for i in gettext xgettext msgfmt msgcat; do for i in gettext xgettext msgfmt msgcat; do

2
pkgs/applications/networking/p2p/mldonkey/default.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
# Byte code compilation (the ocaml opt compiler is not supported in many platforms) # Byte code compilation (the ocaml opt compiler is not supported in many platforms)
buildPhase = "make mlnet.byte"; buildPhase = "make mlnet.byte";
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp mlnet.byte $out/bin/mlnet cp mlnet.byte $out/bin/mlnet
''; '';

4
pkgs/applications/networking/pjsip/default.nix
View File

@ -11,9 +11,9 @@ stdenv.mkDerivation rec {
buildInputs = [ openssl libsamplerate ]; buildInputs = [ openssl libsamplerate ];
postInstall = '' postInstall = ''
ensureDir $out/bin mkdir -p $out/bin
cp pjsip-apps/bin/pjsua-* $out/bin/pjsua 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 cp pjsip-apps/bin/samples/*/* $out/share/${name}/samples
''; '';

4
pkgs/applications/networking/skype/default.nix
View File

@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
phases = "unpackPhase installPhase"; phases = "unpackPhase installPhase";
installPhase = '' installPhase = ''
ensureDir $out/{opt/skype/,bin} mkdir -p $out/{opt/skype/,bin}
cp -r * $out/opt/skype/ cp -r * $out/opt/skype/
fullPath= fullPath=
@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
--- ---
> Icon=$out/opt/skype/icons/SkypeBlue_48x48.png > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png
EOF EOF
ensureDir $out/share/applications mkdir -p $out/share/applications
mv skype.desktop $out/share/applications mv skype.desktop $out/share/applications
''; '';

2
pkgs/applications/networking/sync/unison/default.nix
View File

@ -21,7 +21,7 @@ stdenv.mkDerivation (rec {
makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "")
+ (if ! nativeCode then " NATIVE=false" else ""); + (if ! nativeCode then " NATIVE=false" else "");
preInstall = "ensureDir $out/bin"; preInstall = "mkdir -p $out/bin";
postInstall = if enableX11 then '' postInstall = if enableX11 then ''
for i in $(cd $out/bin && ls); do for i in $(cd $out/bin && ls); do

2
pkgs/applications/networking/vnstat/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
installPhase = '' 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/vnstat $out/bin
cp src/vnstatd $out/sbin cp src/vnstatd $out/sbin
cp man/vnstat.1 man/vnstatd.1 $out/share/man/man1 cp man/vnstat.1 man/vnstatd.1 $out/share/man/man1

2
pkgs/applications/office/impressive/default.nix
View File

@ -25,7 +25,7 @@ in
''; '';
installPhase = '' installPhase = ''
ensureDir "$out/bin" "$out/share/doc/impressive" mkdir -p "$out/bin" "$out/share/doc/impressive"
mv impressive.py "$out/bin/impressive" mv impressive.py "$out/bin/impressive"
mv * "$out/share/doc/impressive" mv * "$out/share/doc/impressive"

2
pkgs/applications/office/mmex/default.nix
View File

@ -19,7 +19,7 @@ in
''; '';
installPhase = '' installPhase = ''
ensureDir $out/opt/mmex mkdir -p $out/opt/mmex
cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex cp -r mmex runtime/{*.txt,*.png,*.db3,en,help,*.wav,*.ico} $out/opt/mmex
''; '';

4
pkgs/applications/office/openoffice/builder.sh
View File

@ -70,7 +70,7 @@ installPhase() {
-f openoffice.lst -l en-US -p OpenOffice \ -f openoffice.lst -l en-US -p OpenOffice \
-buildid $BUILD -simple $ooFiles) -buildid $BUILD -simple $ooFiles)
ensureDir $out/bin mkdir -p $out/bin
for i in soffice ooffice; do wrapSOffice $i; done for i in soffice ooffice; do wrapSOffice $i; done
# Create some wrappers to start individual OpenOffice components. # 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 # Create symlinks to desktop files, so that openoffice.org apps can be picked from
# the application menu in KDE and GNOME # 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 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 # Apply a minor correction to the *.desktop files in order to correctly address the icons

2
pkgs/applications/office/openoffice/get-go-src.nix
View File

@ -28,7 +28,7 @@ lib.overrideDerivation go_oo (attrs: {
makesh = '' makesh = ''
sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download sed -i -e '/-x $WG/d' -e "s/WGET='''/WGET='echo XXX'/" download
ensureDir $out mkdir -p $out
set +e set +e
./download --all | grep XXX | ./download --all | grep XXX |

2
pkgs/applications/office/openoffice/go-oo.nix
View File

@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
bin/ooinstall $out 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 for a in $out/program/{sbase,scalc,sdraw,simpress,smath,soffice,swriter,soffice.bin}; do
ln -s $a $out/bin ln -s $a $out/bin
done done

8
pkgs/applications/science/biology/arb/default.nix
View File

@ -33,22 +33,22 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/lib mkdir -p $out/lib
shareddir=/nix/var/lib/arb shareddir=/nix/var/lib/arb
# link out writable shared location lib/pts # link out writable shared location lib/pts
ensureDir $shareddir/lib/pts mkdir -p $shareddir/lib/pts
cp -vau lib/pts $shareddir/lib cp -vau lib/pts $shareddir/lib
rm -vrf lib/pts rm -vrf lib/pts
ln -vs $shareddir/lib/pts $out/lib/pts ln -vs $shareddir/lib/pts $out/lib/pts
chmod a+rwx $shareddir/lib/pts chmod a+rwx $shareddir/lib/pts
# link out writable shared location lib/nas/ # link out writable shared location lib/nas/
ensureDir $shareddir/lib/nas mkdir -p $shareddir/lib/nas
cp -vau lib/nas $shareddir/lib cp -vau lib/nas $shareddir/lib
rm -vrf lib/nas rm -vrf lib/nas
ln -vs $shareddir/lib/nas $out/lib/nas ln -vs $shareddir/lib/nas $out/lib/nas
chmod a+rwx $shareddir/lib/nas chmod a+rwx $shareddir/lib/nas
# link out shared lib/pixmaps (not sure about this, yet): # 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 cp -vau lib/pixmaps $shareddir/lib
rm -vrf lib/pixmaps rm -vrf lib/pixmaps
ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps ln -vs $shareddir/lib/pixmaps $out/lib/pixmaps

4
pkgs/applications/science/biology/pal2nal/default.nix
View File

@ -8,11 +8,11 @@ stdenv.mkDerivation {
}; };
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp -v pal2nal.pl $out/bin cp -v pal2nal.pl $out/bin
ensureDir $out/doc mkdir -p $out/doc
cp -v README $out/doc cp -v README $out/doc
''; '';

2
pkgs/applications/science/biology/slr/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
make -fMakefile.linux make -fMakefile.linux
''; '';
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp -v ../Slr $out/bin cp -v ../Slr $out/bin
''; '';

2
pkgs/applications/science/geometry/tetgen/default.nix
View File

@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp tetgen $out/bin cp tetgen $out/bin
''; '';

4
pkgs/applications/science/logic/hol/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation {
buildInputs = [polyml]; buildInputs = [polyml];
buildCommand = '' buildCommand = ''
ensureDir "$out/src" mkdir -p "$out/src"
cd "$out/src" cd "$out/src"
tar -xzf "$src" tar -xzf "$src"
@ -28,7 +28,7 @@ stdenv.mkDerivation {
bin/build -expk -symlink bin/build -expk -symlink
ensureDir "$out/bin" mkdir -p "$out/bin"
ln -st $out/bin $out/src/hol/bin/* ln -st $out/bin $out/src/hol/bin/*
# ln -s $out/src/hol/bin $out/bin # ln -s $out/src/hol/bin $out/bin
''; '';

2
pkgs/applications/science/logic/hol_light/default.nix
View File

@ -27,7 +27,7 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
ensureDir "$out/lib/hol_light" "$out/bin" mkdir -p "$out/lib/hol_light" "$out/bin"
cp -a . $out/lib/hol_light cp -a . $out/lib/hol_light
echo "${start_script}" > "$out/bin/hol_light" echo "${start_script}" > "$out/bin/hol_light"
chmod a+x "$out/bin/hol_light" chmod a+x "$out/bin/hol_light"

4
pkgs/applications/science/logic/iprover/default.nix
View File

@ -30,10 +30,10 @@ rec {
phaseNames = ["doConfigure" "doMake" "doDeploy"]; phaseNames = ["doConfigure" "doMake" "doDeploy"];
configureCommand = "sh configure"; configureCommand = "sh configure";
doDeploy = a.fullDepEntry ('' doDeploy = a.fullDepEntry (''
ensureDir "$out/bin" mkdir -p "$out/bin"
cp iproveropt "$out/bin" cp iproveropt "$out/bin"
ensureDir "$out/share/${name}" mkdir -p "$out/share/${name}"
cp *.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 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 chmod a+x "$out"/bin/iprover

2
pkgs/applications/science/logic/isabelle/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
mv $TMP/$name $out mv $TMP/$name $out
cd $out/$name cd $out/$name
bin/isabelle install -p $out/bin bin/isabelle install -p $out/bin

6
pkgs/applications/science/logic/leo2/default.nix
View File

@ -29,17 +29,17 @@ rec {
phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"]; phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"];
makeInstallationDir = a.fullDepEntry ('' makeInstallationDir = a.fullDepEntry (''
ensureDir "$out/share/leo2/build-dir" mkdir -p "$out/share/leo2/build-dir"
cd "$out/share/leo2/build-dir" cd "$out/share/leo2/build-dir"
'') ["minInit" "defEnsureDir"]; '') ["minInit" "defEnsureDir"];
goSrcDir = "cd src/"; goSrcDir = "cd src/";
doFinalize = a.fullDepEntry ('' 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" echo -e "#! /bin/sh\\n$PWD/../bin/leo --atprc $out/etc/leoatprc \"\$@\"\\n" > "$out/bin/leo"
chmod a+x "$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" echo -e "e = ${eprover}/bin/eprover\\nepclextract = ${eprover}/bin/epclextract" > "$out/etc/leoatprc"
'') ["minInit" "doMake" "defEnsureDir"]; '') ["minInit" "doMake" "defEnsureDir"];

2
pkgs/applications/science/logic/matita/default.nix
View File

@ -41,7 +41,7 @@ stdenv.mkDerivation {
''; '';
postInstall = '' postInstall = ''
ensureDir $out/bin mkdir -p $out/bin
ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin ln -vs $RTDIR/matita $RTDIR/matitac $RTDIR/matitaclean $RTDIR/matitadep $RTDIR/matitawiki $out/bin
''; '';

Some files were not shown because too many files have changed in this diff Show More