stdenv: Kill off ensureDir

wip/yesman
adisbladis 7 years ago
parent 03dca870ab
commit c2316114bc
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
  1. 2
      pkgs/development/interpreters/erlang/R16B02-basho.nix
  2. 2
      pkgs/servers/x11/xorg/overrides.nix
  3. 10
      pkgs/stdenv/generic/setup.sh
  4. 4
      pkgs/tools/networking/bud/default.nix

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

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

@ -188,16 +188,6 @@ addToSearchPath() {
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.
# The function is used in multiple-outputs.sh hook,
# so it is defined here but tried after the hook.

@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
buildInputs = [
python gyp
] ++ lib.optional stdenv.isLinux utillinux;
buildPhase = ''
python ./gyp_bud -f make
make -C out
'';
installPhase = ''
ensureDir $out/bin
mkdir -p $out/bin
cp out/Release/bud $out/bin
'';

Loading…
Cancel
Save