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

View File

@@ -27,7 +27,7 @@ in
'';
patchPhase = ''
ensureDir "$out/share/man/man3"
mkdir -p "$out/share/man/man3"
sed -i "linuxthreads/man/Makefile" \
-e "s|MANDIR *=.*$|MANDIR = $out/share/man/man3| ;

View File

@@ -4,9 +4,9 @@ source "$stdenv/setup" || exit 1
echo "source is \`$src', report name is \`$reportName'"
ensureDir "$out/share/info" && \
mkdir -p "$out/share/info" && \
makeinfo -o "$out/share/info/${reportName}.info" "$src"
# XXX: HTML output is apparently broken.
#ensureDir "$out/share/doc/${reportName}" && \
#mkdir -p "$out/share/doc/${reportName}" && \
#makeinfo -o "$out/share/doc/${reportName}/html" --html --force "$src"

View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
ensureDir $out/share/man
mkdir -p $out/share/man
cp -R * $out/share/man
'';

View File

@@ -32,7 +32,7 @@ rec {
'' ["addInputs"];
doInstall = a.fullDepEntry (''
ensureDir "$out"/share/fonts/ttf/
mkdir -p "$out"/share/fonts/ttf/
cp ANDAGII_.TTF "$out"/share/fonts/ttf/andagii.ttf
'') ["defEnsureDir" "minInit"];

View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
};
buildPhase = "true";
installPhase = "ensureDir $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
installPhase = "mkdir -p $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
meta = {
description = "TrueType versions of the Computer Modern and AMS TeX Fonts";

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
installPhase =
''
ensureDir $out/share/fonts
mkdir -p $out/share/fonts
cp *.bdf $out/share/fonts
cd $out/share/fonts
mkfontdir

View File

@@ -42,7 +42,7 @@ stdenv.mkDerivation {
cabextract --lowercase viewer1.cab
fontDir=$out/share/fonts/truetype
ensureDir $fontDir
mkdir -p $fontDir
cp *.ttf $fontDir
# Also put the EULA there to be on the safe side.

View File

@@ -19,11 +19,11 @@ stdenv.mkDerivation {
ln -s ${perl}/lib/*/*/unicore/* -t resources/
'';
installPhase = ''
ensureDir $out/share/fonts/truetype
mkdir -p $out/share/fonts/truetype
for i in $(find build -name '*.ttf'); do
cp $i $out/share/fonts/truetype;
done;
ensureDir $out/share/dejavu-fonts
mkdir -p $out/share/dejavu-fonts
cp -r build/* $out/share/dejavu-fonts
'';
}

View File

@@ -7,7 +7,7 @@ args : with args;
in with localDefs;
let
doInstall = fullDepEntry ("
ensureDir \$out/share/fonts/
mkdir -p \$out/share/fonts/
cd \$out/share/fonts
for i in ${toString paths}; do
find \$i -type f -exec ln -s '{}' . ';' ;

View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
installPhase = ''
ensureDir $out/share/fonts/truetype
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';

View File

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
installPhase =
''
ensureDir $out/share/fonts/junicode-ttf
mkdir -p $out/share/fonts/junicode-ttf
cp *.ttf $out/share/fonts/junicode-ttf
'';

View File

@@ -9,8 +9,8 @@ stdenv.mkDerivation {
};
installPhase = ''
ensureDir $out/texmf/
ensureDir $out/share/fonts/
mkdir -p $out/texmf/
mkdir -p $out/share/fonts/
cp -r ./* $out/texmf/
cp -r fonts/{opentype,type1} $out/share/fonts/

View File

@@ -11,7 +11,7 @@ stdenv.mkDerivation {
unzip $src;
'';
installPhase = ''
ensureDir $out/share/fonts/truetype
mkdir -p $out/share/fonts/truetype
cp *.ttf $out/share/fonts/truetype
'';
}

View File

@@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
};
installPhase = ''
ensureDir $out/share/fonts/truetype
mkdir -p $out/share/fonts/truetype
cp -v *.ttf $out/share/fonts/truetype
ensureDir "$out/doc/${name}"
mkdir -p "$out/doc/${name}"
cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}"
'';

View File

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
buildPhase = "true";
installPhase = "
fontDir=$out/share/fonts/truetype
ensureDir $fontDir
mkdir -p $fontDir
cp *.ttf $fontDir
";
}

View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
installPhase =
''
ensureDir $out/share/fonts $out/share/fonts/truetype
mkdir -p $out/share/fonts $out/share/fonts/truetype
cp ${pcf} $out/share/fonts/unifont.pcf.gz
gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf
cd $out/share/fonts

View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildPhase = "true";
installPhase = "
ensureDir $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype
mkdir -p $out/share/fonts/truetype; cp *.ttf $out/share/fonts/truetype
";
meta = {

View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
installPhase =
''
ensureDir $out/share/fonts
mkdir -p $out/share/fonts
cp *.ttf $out/share/fonts
'';

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
installPhase =
''
ensureDir $out/etc
mkdir -p $out/etc
bunzip2 < $src > $out/etc/ca-bundle.crt
'';

View File

@@ -4,14 +4,14 @@ unpackFile $src
cd docbook-*
ensureDir $out/xml/rng
mkdir -p $out/xml/rng
cp -prv rng $out/xml/rng/docbook
ensureDir $out/xml/dtd
mkdir -p $out/xml/dtd
cp -prv dtd $out/xml/dtd/docbook
ensureDir $out/share/doc
mkdir -p $out/share/doc
cp -prv docs $out/share/doc/docbook
ensureDir $out/share/docbook
mkdir -p $out/share/docbook
cp -prv tools $out/share/docbook/

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation {
installPhase =
''
ensureDir $out/xml/dtd/xhtml1
mkdir -p $out/xml/dtd/xhtml1
cp DTD/*.ent DTD/*.dtd $out/xml/dtd/xhtml1
# Generate an XML catalog.

View File

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
installPhase =
''
ensureDir $out/xml/xsl
mkdir -p $out/xml/xsl
cd ..
mv docbook-xsl-ns-* $out/xml/xsl/docbook
'';

View File

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