diff options
Diffstat (limited to 'pkgs/development/libraries/nss/default.nix')
| -rw-r--r-- | pkgs/development/libraries/nss/default.nix | 59 |
1 files changed, 27 insertions, 32 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index d38fc19f40e12..de980d718f33e 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -1,68 +1,58 @@ -{ stdenv, fetchurl, fetchgit, nspr, perl, zlib, sqlite +{ stdenv, fetchurl, nspr, perl, zlib, sqlite , includeTools ? false }: let - nssPEM = fetchgit { - url = "git://git.fedorahosted.org/git/nss-pem.git"; - rev = "07a683505d4a0a1113c4085c1ce117425d0afd80"; - sha256 = "e4a9396d90e50e8b3cceff45f312eda9aaf356423f4eddd354a0e1afbbfd4cf8"; + nssPEM = fetchurl { + url = http://dev.gentoo.org/~anarchy/patches/nss-3.15-pem-support-20130617.patch.xz; + sha256 = "1k1m8lsgqwxx251943hks1dd13hz1adpqqb0hxwn011by5vmi201"; }; secLoadPatch = fetchurl { name = "security_load.patch"; - urls = [ - # "http://patch-tracker.debian.org/patch/series/dl/nss/2:3.13.6-1/85_security_load.patch" - # "http://anonscm.debian.org/gitweb/?p=pkg-mozilla/nss.git;a=blob_plain;f=debian/patches/85_security_load.patch;hb=HEAD" - "http://www.parsix.org/export/7797/pkg/security/raul/main/nss/trunk/debian/patches/85_security_load.patch" - ]; - sha256 = "8a8d0ae4ebbd7c389973fa5d26d8bc5f473046c6cb1d8283cb9a3c1f4c565c47"; + urls = http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.1-1/85_security_load.patch; + sha256 = "041c6v4cxwsy14qr5m9qs0gkv3w24g632cwpz27kacxpa886r1ds"; }; in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.14.3"; + version = "3.15.1"; src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_14_3_RTM/src/${name}.tar.gz"; - sha1 = "94d8781d1fa29cfbd37453dda3e9488709b82c4c"; + url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_15_1_RTM/src/${name}.tar.gz"; + sha1 = "1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0"; }; 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" + prePatch = '' + xz -d < ${nssPEM} | patch -p1 ''; - patches = [ - ./nss-3.14.1-gentoo-fixups-r1.patch - secLoadPatch - ./nix_secload_fixup.patch - ./sync-up-with-upstream-softokn-changes.patch - ]; + patches = + [ ./nss-3.15-gentoo-fixups.patch + secLoadPatch + ./nix_secload_fixup.patch + ]; postPatch = '' - sed -i -e 's/^DIRS.*$/& pem/' mozilla/security/nss/lib/ckfw/manifest.mn - - # Fix up the patch from Gentoo + # Fix up the patch from Gentoo. sed -i \ -e "/^PREFIX =/s|= /usr|= $out|" \ -e '/@libdir@/s|gentoo/nss|lib|' \ -e '/ln -sf/d' \ - mozilla/security/nss/config/Makefile + nss/config/Makefile # Note for spacing/tab nazis: The TAB characters are intentional! - cat >> mozilla/security/nss/config/Makefile <<INSTALL_TARGET + cat >> nss/config/Makefile <<INSTALL_TARGET install: mkdir -p \$(DIST)/lib/pkgconfig cp nss.pc \$(DIST)/lib/pkgconfig INSTALL_TARGET ''; - preConfigure = "cd mozilla/security/nss"; + preConfigure = "cd nss"; makeFlags = [ "NSPR_INCLUDE_DIR=${nspr}/include/nspr" @@ -74,8 +64,6 @@ in stdenv.mkDerivation rec { "NSS_USE_SYSTEM_SQLITE=1" ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1"; - buildFlags = [ "build_coreconf" "build_dbm" "all" ]; - postInstall = '' rm -rf $out/private mv $out/public $out/include @@ -83,6 +71,8 @@ in stdenv.mkDerivation rec { rmdir $out/*.OBJ cp -av config/nss-config $out/bin/nss-config + + ln -s lib $out/lib64 ''; postFixup = '' @@ -94,4 +84,9 @@ in stdenv.mkDerivation rec { '' + stdenv.lib.optionalString (!includeTools) '' find $out/bin -type f \( -name nss-config -o -delete \) ''; + + meta = { + homepage = https://developer.mozilla.org/en-US/docs/NSS; + description = "A set of libraries for development of security-enabled client and server applications"; + }; } |