Carrier update

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

2 files changed, 55 insertions, 1 deletions

diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
new file mode 100644
index 000000000000..db120924a9cb
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -0,0 +1,54 @@
+args : with args; 
+/*
+  arguments: all buildInputs
+  optional: purple2Source: purple-2 source - place to copy libpurple from 
+    (to use a fresher pidgin build)
+*/
+let 
+  externalPurple2 = (lib.getAttr ["purple2Source"] null args) != null; 
+in
+rec {
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/funpidgin/carrier-2.5.0.tar.bz2;
+    sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28";
+  };
+
+  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"]
+    ++ (lib.optional externalPurple2 "postInstall")
+  ;
+      
+  name = "carrier-" + version;
+  meta = {
+    description = "Carrier - PidginIM GUI fork with user-friendly development model";
+    homepage = http://funpidgin.sf.net; 
+  };
+} // (if externalPurple2 then {
+  postInstall = FullDepEntry (''
+      ensureDir $out/lib/purple-2
+      cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
+    '') ["minInit" "defEnsureDir"]; }
+  else {})
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 156c86df257d..94937b61b16e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7106,7 +7106,7 @@ let
     inherit fetchurl stdenv ncurses;
   };
 
-  carrier = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/carrier "2.4.2") {
+  carrier = builderDefsPackage (selectVersion ../applications/networking/instant-messengers/carrier "2.5.0") {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
       gtkspell aspell gettext ncurses avahi dbus dbus_glib python
       libtool automake autoconf;