* Merge the makeFlags check.

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10810
This commit is contained in:
Eelco Dolstra 2008-02-21 16:23:47 +00:00
commit a62b2564ba
2 changed files with 30 additions and 1 deletions

View file

@ -0,0 +1,29 @@
args : with args; with builderDefs {src="";} null;
let localDefs = builderDefs (rec {
src = /* put a fetchurl here */
fetchurl {
url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_4_5.tar.gz;
sha256 = "0j1ddk0wiqxhbi3872vf2mqx0jynswrvbfbabrp73zqhz3mdvsal";
};
buildInputs = [jre];
configureFlags = [];
installPhase = FullDepEntry (''
sed -e 's@\(common_jvm_locations\)=.*@\1${jre}@' -i bin/openfire
cp -r . $out
'')
["minInit" "doUnpack" "findInputs"];
}) null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec {
name = "openfire-"+version;
builder = writeScript (name + "-builder")
(textClosure localDefs
[ doForceShare doPropagate installPhase]);
meta = {
description = "
XMPP server in Java.
";
};
}

View file

@ -615,7 +615,7 @@ buildPhase() {
eval "$preBuild"
if ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then
if test -z "$makeFlags" && ! test -n "$makefile" -o -e "Makefile" -o -e "makefile" -o -e "GNUmakefile"; then
echo "no Makefile, doing nothing"
return
fi