diff options
author | taku0 <mxxouy6x3m_github@tatapa.org> | 2017-09-29 08:52:45 +0900 |
---|---|---|
committer | taku0 <mxxouy6x3m_github@tatapa.org> | 2017-10-04 21:12:12 +0900 |
commit | 6e2744ab0ff384ed43bcab5bfa564bc4289b4b55 (patch) | |
tree | 4846182c27f5239b0b9e5ad72f80ce59895294a1 /pkgs/development/libraries/nss | |
parent | 5ae175744af57dc5a002fc8902a7fcd0d488f860 (diff) | |
download | nixlib-6e2744ab0ff384ed43bcab5bfa564bc4289b4b55.tar nixlib-6e2744ab0ff384ed43bcab5bfa564bc4289b4b55.tar.gz nixlib-6e2744ab0ff384ed43bcab5bfa564bc4289b4b55.tar.bz2 nixlib-6e2744ab0ff384ed43bcab5bfa564bc4289b4b55.tar.lz nixlib-6e2744ab0ff384ed43bcab5bfa564bc4289b4b55.tar.xz nixlib-6e2744ab0ff384ed43bcab5bfa564bc4289b4b55.tar.zst nixlib-6e2744ab0ff384ed43bcab5bfa564bc4289b4b55.zip |
nss: 3.31 -> 3.32.1
Diffstat (limited to 'pkgs/development/libraries/nss')
-rw-r--r-- | pkgs/development/libraries/nss/default.nix | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 80975c8ef5dc..c88cfb8826ec 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.31"; + version = "3.32.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_31_RTM/src/${name}.tar.gz"; - sha256 = "0pd643a8ns7q5az5ai3ascrw666i2kbfiyy1c9hlhw9jd8jn21g9"; + url = "mirror://mozilla/security/nss/releases/NSS_3_32_1_RTM/src/${name}.tar.gz"; + sha256 = "0lj6c94102aa81bnjisnix09zfjly9aa1d6vrzxmcjmzynkrrrad"; }; buildInputs = [ perl zlib sqlite ]; @@ -25,37 +25,13 @@ in stdenv.mkDerivation rec { ''; patches = - [ # Install a nss.pc (pkgconfig) file and nss-config script - # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 - (fetchurl { - name = "nss-3.28-gentoo-fixups.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/" - + "dev-libs/nss/files/nss-3.28-gentoo-fixups.patch" - + "?id=05c31f8cca591b3ce8219e4def7c26c7b1b130d6"; - sha256 = "0z58axd1n7vq4kdp5mrb3dsg6di39a1g40s3shl6n2dzs14c1y2q"; - }) + [ # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch ./85_security_load.patch ]; patchFlags = "-p0"; - postPatch = '' - # Fix up the patch from Gentoo. - sed -i \ - -e "/^PREFIX =/s|= /usr|= $out|" \ - -e '/@libdir@/s|gentoo/nss|lib|' \ - -e '/ln -sf/d' \ - nss/config/Makefile - - # Note for spacing/tab nazis: The TAB characters are intentional! - cat >> nss/config/Makefile <<INSTALL_TARGET - install: - mkdir -p \$(DIST)/lib/pkgconfig - cp nss.pc \$(DIST)/lib/pkgconfig - INSTALL_TARGET - ''; - outputs = [ "out" "dev" "tools" ]; preConfigure = "cd nss"; @@ -79,9 +55,31 @@ in stdenv.mkDerivation rec { mv $out/*.OBJ/* $out/ rmdir $out/*.OBJ - cp -av config/nss-config $out/bin/nss-config - ln -s lib $out/lib64 + + # Upstream issue: https://bugzilla.mozilla.org/show_bug.cgi?id=530672 + # https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/nss/files/nss-3.32-gentoo-fixups.patch?id=af1acce6c6d2c3adb17689261dfe2c2b6771ab8a + NSS_MAJOR_VERSION=`grep "NSS_VMAJOR" lib/nss/nss.h | awk '{print $3}'` + NSS_MINOR_VERSION=`grep "NSS_VMINOR" lib/nss/nss.h | awk '{print $3}'` + NSS_PATCH_VERSION=`grep "NSS_VPATCH" lib/nss/nss.h | awk '{print $3}'` + PREFIX="$out" + + mkdir -p $out/lib/pkgconfig + sed -e "s,%prefix%,$PREFIX," \ + -e "s,%exec_prefix%,$PREFIX," \ + -e "s,%libdir%,$PREFIX/lib64," \ + -e "s,%includedir%,$PREFIX/include/nss," \ + -e "s,%NSS_VERSION%,$NSS_MAJOR_VERSION.$NSS_MINOR_VERSION.$NSS_PATCH_VERSION,g" \ + -e "s,%NSPR_VERSION%,4.16,g" \ + pkg/pkg-config/nss.pc.in > $out/lib/pkgconfig/nss.pc + chmod 0644 $out/lib/pkgconfig/nss.pc + + sed -e "s,@prefix@,$PREFIX," \ + -e "s,@MOD_MAJOR_VERSION@,$NSS_MAJOR_VERSION," \ + -e "s,@MOD_MINOR_VERSION@,$NSS_MINOR_VERSION," \ + -e "s,@MOD_PATCH_VERSION@,$NSS_PATCH_VERSION," \ + pkg/pkg-config/nss-config.in > $out/bin/nss-config + chmod 0755 $out/bin/nss-config ''; postFixup = '' |