* "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:
@@ -26,7 +26,7 @@ rec {
|
||||
cd bmrsa
|
||||
unzip ${src}
|
||||
sed -e 's/gcc/g++/' -i Makefile
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/bin
|
||||
echo -e 'install:\n\tcp bmrsa '$out'/bin' >> Makefile
|
||||
'') ["minInit" "addInputs" "defEnsureDir"];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
|
||||
};
|
||||
|
||||
installPhase = "
|
||||
ensureDir $out/sbin
|
||||
mkdir -p $out/sbin
|
||||
cp check_wtmpx chkdirs chklastlog chkproc chkrootkit chkutmp chkwtmp ifpromisc strings-static $out/sbin
|
||||
";
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ rec {
|
||||
configureFlags = [];
|
||||
|
||||
doInstall = fullDepEntry(''
|
||||
ensureDir $out/share/msf
|
||||
ensureDir $out/bin
|
||||
mkdir -p $out/share/msf
|
||||
mkdir -p $out/bin
|
||||
|
||||
cp -r * $out/share/msf
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
phases = [ "installPhase" ];
|
||||
|
||||
installPhase = ''
|
||||
ensureDir $out/etc
|
||||
mkdir -p $out/etc
|
||||
cp ${opensc}/etc/opensc.conf $out/etc
|
||||
chmod +w $out/etc/opensc.conf
|
||||
|
||||
|
||||
@@ -19,10 +19,10 @@ stdenv.mkDerivation {
|
||||
buildPhase = "true";
|
||||
|
||||
installPhase =
|
||||
'' ensureDir "$out/bin"
|
||||
'' mkdir -p "$out/bin"
|
||||
cp -v pius "$out/bin"
|
||||
|
||||
ensureDir "$out/doc/pius-${version}"
|
||||
mkdir -p "$out/doc/pius-${version}"
|
||||
cp -v README "$out/doc/pius-${version}"
|
||||
'';
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
preConfigure = ''
|
||||
sed -e s@/usr/@$out/@g -i Makefile
|
||||
sed -e 's@ln -f@ln -sf@g' -i Makefile
|
||||
ensureDir $out/bin $out/share/man/man1
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
'';
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
sed -e s@/usr/@$out/@g -i Makefile
|
||||
cp ssss.manpage.xml ssss.1
|
||||
cp ssss.manpage.xml ssss.1.html
|
||||
ensureDir $out/bin $out/share/man/man1
|
||||
mkdir -p $out/bin $out/share/man/man1
|
||||
echo -e 'install:\n\tcp ssss-combine ssss-split '"$out"'/bin' >>Makefile
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user