* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
This commit is contained in:
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/sbin $out/etc
|
||||
mkdir -p $out/sbin $out/etc
|
||||
cp script/bootchartd $out/sbin
|
||||
cp script/bootchartd.conf $out/etc
|
||||
chmod +x $out/sbin/bootchartd
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
|
||||
echo '#define _PATH_SENDMAIL "${sendmailPath}"' >> pathnames.h
|
||||
'';
|
||||
|
||||
preInstall = "ensureDir $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8";
|
||||
preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8";
|
||||
|
||||
meta = {
|
||||
description = "Vixie Cron, a daemon for running commands at specific times";
|
||||
|
||||
@@ -40,7 +40,7 @@ rec {
|
||||
fixPaths = a.doPatchShebangs ''$out/bin'';
|
||||
|
||||
install_dd_rhelp = a.fullDepEntry (''
|
||||
ensureDir "$out/share/dd_rescue" "$out/bin"
|
||||
mkdir -p "$out/share/dd_rescue" "$out/bin"
|
||||
tar xf "${dd_rhelp_src}" -C "$out/share/dd_rescue"
|
||||
cp "$out/share/dd_rescue"/dd_rhelp*/dd_rhelp "$out/bin"
|
||||
'') ["minInit" "defEnsureDir"];
|
||||
|
||||
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [ libuuid popt icu ncurses ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/sbin
|
||||
ensureDir $out/share/man/man8
|
||||
mkdir -p $out/sbin
|
||||
mkdir -p $out/share/man/man8
|
||||
install -v -m755 gdisk sgdisk fixparts $out/sbin
|
||||
install -v -m644 gdisk.8 sgdisk.8 fixparts.8 \
|
||||
$out/share/man/man8
|
||||
|
||||
@@ -40,7 +40,7 @@ popd
|
||||
|
||||
# Installation
|
||||
export PLAN9=$out
|
||||
ensureDir $PLAN9
|
||||
mkdir -p $PLAN9
|
||||
GLOBIGNORE='src:.*'
|
||||
cp -R * $PLAN9
|
||||
GLOBIGNORE=
|
||||
|
||||
Reference in New Issue
Block a user