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/development/compilers/openjdk | |
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/development/compilers/openjdk')
-rw-r--r-- | pkgs/development/compilers/openjdk/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 0ea08071aaa0..cf85c1706a8a 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ]; postUnpack = '' - ensureDir drops + mkdir -p drops cp ${jaxp_src} drops/${jaxp_src_name} cp ${jaxws_src} drops/${jaxws_src_name} cp ${jaf_src} drops/${jaf_src_name} @@ -114,14 +114,14 @@ stdenv.mkDerivation rec { ''; installPhase = '' - ensureDir $out + mkdir -p $out cp -av build/*/j2${if jreOnly then "re" else "sdk"}-image/* $out ''; # '' + (if jreOnly then "" else '' # if [ -z $jre ]; then # exit 0 # fi -# ensureDir $jre +# mkdir -p $jre # cp -av build/*/j2re-image/* $jre # ''); |