Fixed setup.sh - non-default Makefile may be passed in makeFlags. OpenFire added, doesn't work yet

svn path=/nixpkgs/branches/stdenv-updates/; revision=10795

4 files changed, 37 insertions, 2 deletions

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index 4aa501178374..da5495aa64e9 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "0azvl43niqkq94drx52p6dvp70r38f25fqw181ywmvqn80dbb3c9";
   };
 
-  unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=lsof_*; ";
+  unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*); ";
   preBuild = "sed -i Makefile -e 's/^CFGF=/&	-DHASIPv6=1/;';";
   configurePhase = "./Configure -n linux;";
   installPhase = " mkdir -p $out/bin $out/man/man8; cp lsof.8 $out/man/man8/; cp lsof $out/bin";
diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/3.4.5.nix
new file mode 100644
index 000000000000..2501372fe55d
--- /dev/null
+++ b/pkgs/servers/xmpp/openfire/3.4.5.nix
@@ -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.
+";
+  };
+}
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 395de988e4cb..a33e715a4cd1 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 436a3701125c..cf6438982fab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3257,6 +3257,12 @@ rec {
     inherit fetchurl stdenv openssh;
   };
 
+  openfireFun = lib.sumArgs (selectVersion ../servers/xmpp/openfire "3.4.5") {
+    inherit builderDefs jre;
+  };
+
+  openfire = openfireFun null;
+
   postgresql = selectVersion ../servers/sql/postgresql "8.3.0" {
     inherit fetchurl stdenv readline ncurses zlib;
   };