From a796d839f94a0e0712d944d2e4efa110953fd9e5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 6 Jul 2009 09:12:44 +0000
Subject: [PATCH] * Updated NSS.

svn path=/nixpkgs/trunk/; revision=16183
---
 pkgs/development/libraries/nspr/default.nix |  5 +++
 pkgs/development/libraries/nss/builder.sh   | 17 -------
 pkgs/development/libraries/nss/default.nix  | 49 ++++++++++++++++-----
 pkgs/top-level/all-packages.nix             |  2 +-
 4 files changed, 43 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/nss/builder.sh

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 3895a6fbc89..43ee0c1c0e1 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -14,6 +14,11 @@ stdenv.mkDerivation {
 
   configureFlags = "--enable-optimize --disable-debug";
 
+  postInstall =
+    ''
+      find $out -name "*.a" | xargs rm
+    '';
+    
   meta = {
     homepage = http://www.mozilla.org/projects/nspr/;
     description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions";
diff --git a/pkgs/development/libraries/nss/builder.sh b/pkgs/development/libraries/nss/builder.sh
deleted file mode 100644
index ae9db584079..00000000000
--- a/pkgs/development/libraries/nss/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-source $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
index cd966cc1121..35fc60db57b 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,18 +1,43 @@
-{stdenv, fetchurl, perl, zip}:
+{stdenv, fetchurl, nspr, perl, zlib}:
 
 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";
+  name = "nss-3.12.3";
+  
+  src = fetchurl {
+    url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_3_RTM/src/nss-3.12.3.tar.bz2;
+    sha1 = "eeca14a37629287baa10eb7562a5fb927e9dd171";
   };
 
-  nsprsrc =  fetchurl {
-    url = ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6/src/nspr-4.6.tar.gz;
-    md5 = "a37c3cde875502e05576429312452465";
-  };
+  buildInputs = [nspr perl zlib];
 
-  buildInputs = [perl zip];
+  # Based on the build instructions at
+  # http://www.mozilla.org/projects/security/pki/nss/nss-3.11.4/nss-3.11.4-build.html
+  
+  preConfigure = "cd mozilla/security/nss";
+
+  BUILD_OPT = "1";
+
+  makeFlags = "NSPR_CONFIG_STATUS= NSDISTMODE=copy BUILD_OPT=1 SOURCE_PREFIX=\$(out)";
+
+  buildFlags = "nss_build_all";
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr";
+
+  preBuild =
+    ''
+      # Fool it into thinking NSPR has already been built.
+      touch build_nspr
+
+      # Hack to make -lz dependencies work.
+      touch cmd/signtool/-lz cmd/modutil/-lz
+    '';
+
+  postInstall =
+    ''
+      find $out -name "*.a" | xargs rm
+      rm -rf $out/private
+      mv $out/public $out/include
+      mv $out/*.OBJ/* $out/
+      rmdir $out/*.OBJ
+    ''; # */
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2c6ca9a363..5a759171695 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3895,7 +3895,7 @@ let
   };
 
   nss = import ../development/libraries/nss {
-    inherit fetchurl stdenv perl zip;
+    inherit fetchurl stdenv nspr perl zlib;
   };
 
   ode = builderDefsPackage (import ../development/libraries/ode) {