stdenv: Kill off ensureDir

This commit is contained in:
adisbladis 2018-01-09 11:14:48 +08:00
parent 03dca870ab
commit c2316114bc
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
4 changed files with 4 additions and 14 deletions

View File

@ -36,7 +36,7 @@ mkDerivation rec {
tar xf "${manpages}" -C "$out/lib/erlang" tar xf "${manpages}" -C "$out/lib/erlang"
for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do for i in "$out"/lib/erlang/man/man[0-9]/*.[0-9]; do
prefix="''${i%/*}" prefix="''${i%/*}"
ensureDir "$out/share/man/''${prefix##*/}" mkdir -p "$out/share/man/''${prefix##*/}"
ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl" ln -s "$i" "$out/share/man/''${prefix##*/}/''${i##*/}erl"
done done
''; '';

View File

@ -546,7 +546,7 @@ in
"--with-sha1=CommonCrypto" "--with-sha1=CommonCrypto"
]; ];
preConfigure = '' preConfigure = ''
ensureDir $out/Applications mkdir -p $out/Applications
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error"
substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices} substituteInPlace hw/xquartz/pbproxy/Makefile.in --replace -F/System -F${args.apple_sdk.frameworks.ApplicationServices}
''; '';

View File

@ -188,16 +188,6 @@ addToSearchPath() {
addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@" addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
} }
ensureDir() {
echo "warning: ensureDir is deprecated; use mkdir instead" >&2
local dir
for dir in "$@"; do
if ! [ -x "$dir" ]; then mkdir -p "$dir"; fi
done
}
# Add $1/lib* into rpaths. # Add $1/lib* into rpaths.
# The function is used in multiple-outputs.sh hook, # The function is used in multiple-outputs.sh hook,
# so it is defined here but tried after the hook. # so it is defined here but tried after the hook.

View File

@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
ensureDir $out/bin mkdir -p $out/bin
cp out/Release/bud $out/bin cp out/Release/bud $out/bin
''; '';