stdenv: Kill off ensureDir
This commit is contained in:
parent
03dca870ab
commit
c2316114bc
@ -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
|
||||||
'';
|
'';
|
||||||
|
@ -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}
|
||||||
'';
|
'';
|
||||||
|
@ -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.
|
||||||
|
@ -14,14 +14,14 @@ stdenv.mkDerivation rec {
|
|||||||
buildInputs = [
|
buildInputs = [
|
||||||
python gyp
|
python gyp
|
||||||
] ++ lib.optional stdenv.isLinux utillinux;
|
] ++ lib.optional stdenv.isLinux utillinux;
|
||||||
|
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
python ./gyp_bud -f make
|
python ./gyp_bud -f make
|
||||||
make -C out
|
make -C out
|
||||||
'';
|
'';
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
ensureDir $out/bin
|
mkdir -p $out/bin
|
||||||
cp out/Release/bud $out/bin
|
cp out/Release/bud $out/bin
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user