From ad0f90ccc0aacbb02f2eb3ed28b35eeab3118c48 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Sun, 2 Mar 2008 22:11:19 +0000
Subject: Updated to the stable 2.0.0

svn path=/nixpkgs/trunk/; revision=10920
---
 pkgs/servers/xmpp/ejabberd/builder.sh  | 5 +++--
 pkgs/servers/xmpp/ejabberd/default.nix | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'pkgs/servers')

diff --git a/pkgs/servers/xmpp/ejabberd/builder.sh b/pkgs/servers/xmpp/ejabberd/builder.sh
index 3d746054f384b..df0dd1963e2a5 100644
--- a/pkgs/servers/xmpp/ejabberd/builder.sh
+++ b/pkgs/servers/xmpp/ejabberd/builder.sh
@@ -1,5 +1,3 @@
-buildInputs="$expat $erlang $zlib $openssl"
-
 source $stdenv/setup
 
 tar xfvz $src
@@ -7,3 +5,6 @@ cd ejabberd-*/src
 ./configure --prefix=$out
 make
 make install
+
+# Fix runtime dependency for erlang
+sed -i -e "s|erl \\\|$erlang/bin/erl \\\|" $out/sbin/ejabberdctl
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index c3c88337c5d42..5409db1cfb36f 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, expat, erlang, zlib, openssl}:
 
 stdenv.mkDerivation {
-  name = "ejabberd-2.0.0-rc1";
+  name = "ejabberd-2.0.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.process-one.net/downloads/ejabberd/2.0.0-rc1/ejabberd-2.0.0-rc1.tar.gz;
-    sha256 = "02ldssvsy0rkvxm96018fpk5lc3iqgkrira9cw1ym2snas0k8nzy";
+    url = http://www.process-one.net/downloads/ejabberd/2.0.0/ejabberd-2.0.0.tar.gz;
+    sha256 = "086e105cb402ef868e3187277db1486807e1b34a2e3e3679f0ee6de1e5fd2e54";
   };
+  buildInputs = [ expat erlang zlib openssl ];
   inherit expat erlang zlib openssl;
 }
-- 
cgit 1.4.1