diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-01-18 20:16:00 +0000 |
commit | c556a6ea46e71e1907d78b71fab36df30297b3ad (patch) | |
tree | 91a51d04a39ab4db1fb5182b56ce63cf9d9779b9 /pkgs/build-support/release/ant-build.nix | |
parent | f7159c195a623c311829c38c40ef010ac6e943f7 (diff) | |
download | nixlib-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar nixlib-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.gz nixlib-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.bz2 nixlib-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.lz nixlib-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.xz nixlib-c556a6ea46e71e1907d78b71fab36df30297b3ad.tar.zst nixlib-c556a6ea46e71e1907d78b71fab36df30297b3ad.zip |
* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
Diffstat (limited to 'pkgs/build-support/release/ant-build.nix')
-rw-r--r-- | pkgs/build-support/release/ant-build.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/release/ant-build.nix b/pkgs/build-support/release/ant-build.nix index 2aa08ee27dec..fe15f93a8fe2 100644 --- a/pkgs/build-support/release/ant-build.nix +++ b/pkgs/build-support/release/ant-build.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation ( ''; installPhase = '' - ensureDir $out/lib/java + mkdir -p $out/lib/java ${ if jars == [] then '' find . -name "*.jar" | xargs -I{} cp -v {} $out/lib/java '' else stdenv.lib.concatMapStrings (j: '' @@ -58,7 +58,7 @@ stdenv.mkDerivation ( header "Generating jar wrappers" '' + (stdenv.lib.concatMapStrings (w: '' - ensureDir $out/bin + mkdir -p $out/bin cat >> $out/bin/${w.name} <<EOF #! /bin/sh export JAVA_HOME=$jre @@ -98,7 +98,7 @@ stdenv.mkDerivation ( buildInputs = [ant jre] ++ stdenv.lib.optional (args ? buildInputs) args.buildInputs ; postHook = '' - ensureDir $out/nix-support + mkdir -p $out/nix-support echo "$system" > $out/nix-support/system # If `src' is the result of a call to `makeSourceTarball', then it |