Updated Funpidgin 2.4.1 to Carrier 2.4.2 (rename of the fork, yes)

svn path=/nixpkgs/trunk/; revision=12118

2 files changed, 38 insertions, 29 deletions

diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
new file mode 100644
index 0000000000000..f20f939efeda4
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.4.2.nix
@@ -0,0 +1,38 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/funpidgin/carrier-2.4.2.tar.bz2;
+    sha256 = "176mi7gxkvvrmxsd58bi8qgkc209gpnlp21hh3j0dmb9zszyh7kp";
+  };
+
+  buildInputs = [gtkspell aspell
+    GStreamer startupnotification
+    libxml2 openssl nss
+    libXScrnSaver ncurses scrnsaverproto 
+    libX11 xproto kbproto GConf avahi
+    dbus dbus_glib glib python 
+    autoconf libtool automake];
+
+  propagatedBuildInputs = [
+    pkgconfig gtk perl perlXMLParser gettext
+  ];
+
+  configureFlags="--with-nspr-includes=${nss}/include/nspr"
+    + " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
+    + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
+    + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
+
+  preBuild = FullDepEntry (''
+    export echo=echo
+  '') [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
+      
+  name = "carrier-" + version;
+  meta = {
+    description = "Carrier - PidginIM GUI fork with user-friendly development model";
+    homepage = http://funpidgin.sf.net; 
+  };
+}
+
diff --git a/pkgs/applications/networking/instant-messengers/funpidgin/2.4.1.nix b/pkgs/applications/networking/instant-messengers/funpidgin/2.4.1.nix
deleted file mode 100644
index 8db711c2f6d07..0000000000000
--- a/pkgs/applications/networking/instant-messengers/funpidgin/2.4.1.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://downloads.sourceforge.net/funpidgin/funpidgin-2.4.1.tar.bz2;
-    sha256 = "1slzvgwaxl19fdyg7k12nqsvvbjaqv6ivfzwkbvm09596ag5r3mn";
-  };
-
-  buildInputs = [gtkspell aspell
-    GStreamer startupnotification
-    libxml2 openssl nss
-    libXScrnSaver ncurses scrnsaverproto 
-    libX11 xproto kbproto];
-
-  propagatedBuildInputs = [
-    pkgconfig gtk perl perlXMLParser gettext
-  ];
-
-  configureFlags="--with-nspr-includes=${nss}/include/nspr --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --enable-screensaver";
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "funpidgin-" + version;
-  meta = {
-    description = "Funpidgin - PidginIM fork with user-friendly development model";
-    homepage = http://funpidgin.sf.net; 
-  };
-}
-