summary refs log tree commit diff
path: root/pkgs/development/libraries/nss/default.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2012-08-21 06:10:33 +0200
committeraszlig <aszlig@redmoonstudios.org>2012-08-22 08:29:09 +0200
commit5f4ca8ec18cf3a4253845f6f50813833c883d7cc (patch)
tree66df36620fa6532f635a52807ca974632c19b5f7 /pkgs/development/libraries/nss/default.nix
parent485dcc915283661a5d859313484aa8ecaf1a520d (diff)
downloadnixpkgs-5f4ca8ec18cf3a4253845f6f50813833c883d7cc.tar
nixpkgs-5f4ca8ec18cf3a4253845f6f50813833c883d7cc.tar.gz
nixpkgs-5f4ca8ec18cf3a4253845f6f50813833c883d7cc.tar.bz2
nixpkgs-5f4ca8ec18cf3a4253845f6f50813833c883d7cc.tar.lz
nixpkgs-5f4ca8ec18cf3a4253845f6f50813833c883d7cc.tar.xz
nixpkgs-5f4ca8ec18cf3a4253845f6f50813833c883d7cc.tar.zst
nixpkgs-5f4ca8ec18cf3a4253845f6f50813833c883d7cc.zip
nss: Add nss-pem module from fedora.
This is a compatibility module which adds suport for PEM certificates used by
OpenSSL and compatible libraries. The module gets built but isn't used at the
moment, so we're going to work on integration of it later.
Diffstat (limited to 'pkgs/development/libraries/nss/default.nix')
-rw-r--r--pkgs/development/libraries/nss/default.nix15
1 files changed, 14 insertions, 1 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 7bdbf9e199f..a957996d1f1 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite
+{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite
 , includeTools ? false
 }:
 
@@ -9,6 +9,12 @@ let
     sha256 = "1ck9q68fxkjq16nflixbqi4xc6bmylmj994h3f1j42g8mp0xf0vd";
   };
 
+  nssPEM = fetchgit {
+    url = "git://git.fedorahosted.org/git/nss-pem.git";
+    rev = "07a683505d4a0a1113c4085c1ce117425d0afd80";
+    sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8";
+  };
+
 in
 
 stdenv.mkDerivation rec {
@@ -25,12 +31,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ nspr perl zlib sqlite ];
 
+  postUnpack = ''
+    cp -rdv "${nssPEM}/mozilla/security/nss/lib/ckfw/pem" \
+            "$sourceRoot/mozilla/security/nss/lib/ckfw/"
+    chmod -R u+w "$sourceRoot/mozilla/security/nss/lib/ckfw/pem"
+  '';
+
   patches = [ ./nss-3.12.5-gentoo-fixups.diff ];
 
   # Based on the build instructions at
   # http://www.mozilla.org/projects/security/pki/nss/nss-3.11.4/nss-3.11.4-build.html
 
   postPatch = ''
+    sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn
     sed -i -e "/^PREFIX =/s:= /usr:= $out:" mozilla/security/nss/config/Makefile
   '';