Added Mozilla NSS, NSPR and Gaim to Nix. Gaim in Nix supports SSL

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

6 files changed, 79 insertions, 4 deletions

diff --git a/pkgs/applications/networking/instant-messengers/gaim/builder.sh b/pkgs/applications/networking/instant-messengers/gaim/builder.sh
new file mode 100644
index 00000000000..ceff6f1b0ea
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gaim/builder.sh
@@ -0,0 +1,9 @@
+. $stdenv/setup
+
+configureFlags="\
+  --with-nspr-includes=$nss/include/nspr \
+  --with-nspr-libs=$nss/lib \
+  --with-nss-includes=$nss/include/nss \
+  --with-nss-libs=$nss/lib"
+
+genericBuild
\ No newline at end of file
diff --git a/pkgs/applications/networking/instant-messengers/gaim/default.nix b/pkgs/applications/networking/instant-messengers/gaim/default.nix
new file mode 100644
index 00000000000..a70ab9efbf7
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gaim/default.nix
@@ -0,0 +1,27 @@
+/**
+ * Possible missing configuration:
+ *
+ * - silcclient
+ * - libstartup-notification
+ * - libebook-1.2
+ * - libedata-book-1.2
+ * - checking for XScreenSaverRegister in -lXext... no
+ * - checking for XScreenSaverRegister in -lXss... no
+ * - gtkspell
+ * - ao
+ * - audiofile-config
+ * - doxygen
+ */
+{stdenv, fetchurl, pkgconfig, glib, gtk, perl, libxml2, openssl, nss}:
+
+stdenv.mkDerivation {
+  name = "gaim-1.5.0";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/gaim/gaim-1.5.0.tar.gz;
+    md5 = "dd984bd3116d8146545a492d314b0dae";
+  };
+
+  inherit nss;
+  buildInputs = [pkgconfig glib gtk perl libxml2 openssl nss];
+}
diff --git a/pkgs/development/libraries/nss/builder.sh b/pkgs/development/libraries/nss/builder.sh
new file mode 100644
index 00000000000..9b9fa0c304f
--- /dev/null
+++ b/pkgs/development/libraries/nss/builder.sh
@@ -0,0 +1,17 @@
+. $stdenv/setup
+
+# This must be the ugliest builder in the Nix Packages
+
+tar zxvf $nsssrc
+tar zxvf $nsprsrc
+
+mv nspr-*/mozilla/nsprpub nss-*/mozilla
+cd nss-*/mozilla/security/nss
+make nss_build_all
+make install
+
+mkdir -p $out/lib
+mkdir -p $out/include/nspr
+find ../../dist/*/lib -type l -name "*.so" -o -name "*.chk" | xargs --replace cp -L {} $out/lib
+cp -Lr ../../dist/public/* $out/include
+cp -Lr ../../dist/*/include/* $out/include/nspr
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
new file mode 100644
index 00000000000..cd966cc1121
--- /dev/null
+++ b/pkgs/development/libraries/nss/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl, perl, zip}:
+
+stdenv.mkDerivation {
+  name = "nss-3.10";
+  builder = ./builder.sh;
+
+  nsssrc = fetchurl {
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_10_RTM/src/nss-3.10.tar.gz;
+    md5 = "f0d75d52aff21f88d9c055bdb78f54f8";
+  };
+
+  nsprsrc =  fetchurl {
+    url = ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6/src/nspr-4.6.tar.gz;
+    md5 = "a37c3cde875502e05576429312452465";
+  };
+
+  buildInputs = [perl zip];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 7f59b53a41b..3b8da4d2112 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -693,6 +693,10 @@ rec {
     inherit fetchurl stdenv perl;
   };
 
+  nss = (import ../development/libraries/nss) {
+    inherit fetchurl stdenv perl zip;
+  };
+
   freetype = (import ../development/libraries/freetype) {
     inherit fetchurl stdenv;
   };
@@ -1253,11 +1257,10 @@ rec {
     inherit fetchurl stdenv ncurses openssl;
   };
 
-/*  
-  kopete = (import ../applications/networking/instant-messengers/kopete) {
-    inherit fetchurl stdenv xlibs zlib libjpeg perl qt3;
+  gaim = (import ../applications/networking/instant-messengers/gaim) {
+    inherit fetchurl stdenv pkgconfig perl libxml2 openssl nss;
+    inherit (gtkLibs) glib gtk;
   };
-*/
 
   cdparanoiaIII = (import ../applications/audio/cdparanoia) {
     inherit fetchurl stdenv;
diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix
index c9bf0a326bd..9f35b62a30e 100644
--- a/pkgs/system/populate-cache.nix
+++ b/pkgs/system/populate-cache.nix
@@ -67,6 +67,7 @@ let {
     firefoxWrapper
     thunderbird
     lynx
+    gaim
     MPlayer
     MPlayerPlugin
     vlc