* "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:
@@ -39,7 +39,7 @@ EOF
|
||||
|
||||
# Note: We don't build the javadoc.
|
||||
buildPhase = ''
|
||||
ensureDir "$out"
|
||||
mkdir -p "$out"
|
||||
./build.sh -Dant.install="$out" install-lite
|
||||
'';
|
||||
|
||||
@@ -48,7 +48,7 @@ EOF
|
||||
# rearrange a few things.
|
||||
rm -v "$out/bin/"*.bat
|
||||
|
||||
ensureDir "$out/lib/java"
|
||||
mkdir -p "$out/lib/java"
|
||||
mv -v "$out/lib/"*.jar "$out/lib/java"
|
||||
sed -i "$out/bin/ant" \
|
||||
-e "s|^ANT_LIB=.*$|ANT_LIB=$out/lib/java|g ;
|
||||
|
||||
@@ -38,9 +38,9 @@ rec {
|
||||
'' ["build" "addInputs"];
|
||||
|
||||
doDeploy = a.fullDepEntry ''
|
||||
ensureDir "$out/share/bam"
|
||||
mkdir -p "$out/share/bam"
|
||||
cp -r docs examples tests "$out/share/bam"
|
||||
ensureDir "$out/bin"
|
||||
mkdir -p "$out/bin"
|
||||
cp bam "$out/bin"
|
||||
'' ["minInit" "defEnsureDir" "build"];
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage (rec {
|
||||
doCheck = false;
|
||||
|
||||
postInstall =
|
||||
'' ensureDir "$out/share/info"
|
||||
'' mkdir -p "$out/share/info"
|
||||
make -C docs buildbot.info
|
||||
cp -v "docs/buildbot.info"* "$out/share/info"
|
||||
'';
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out
|
||||
mkdir -p $out
|
||||
rm bin/*.bat
|
||||
mv * $out
|
||||
'';
|
||||
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
cp bin.linux/jam $out/bin
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user