public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated nss and nspr, added variant of nss including tools

Browse Source 
svn path=/nixpkgs/trunk/; revision=23105
This commit is contained in:
Rob Vermaas 2010-08-11 09:38:09 +00:00
parent 5c8b4ec35a
commit a60809353a
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/nspr/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl }: { stdenv, fetchurl }:
let version = "4.8.4"; in let version = "4.8.6"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nspr-${version}"; name = "nspr-${version}";
src = fetchurl { src = fetchurl {
url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; url = "http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
sha256 = "0ik73yimgfpj3lkqjnpf76b942j76i5yi1z8bn75dxxc08brl4cc"; sha256 = "0vcz39784bw42kv9f81dnfb9ciga66l4yg223j467yin2nq0n16r";
}; };
preConfigure = "cd mozilla/nsprpub"; preConfigure = "cd mozilla/nsprpub";

12
pkgs/development/libraries/nss/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, nspr, perl, zlib }: { stdenv, fetchurl, nspr, perl, zlib, includeTools ? false}:
let let
@ -10,11 +10,11 @@ let
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nss-3.12.6"; name = "nss-3.12.7";
src = fetchurl { src = fetchurl {
url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_6_RTM/src/nss-3.12.6.tar.gz; url = http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_12_7_RTM/src/nss-3.12.7.tar.gz;
sha1 = "461e81adbdef6c3f848fcfee0dc5ad8c2dbebd46"; sha256 = "0x5h0r5hn4qzafxakhvqyw1r8r0zy09b7b0kmdh3ff6v29v4bnzx";
}; };
buildInputs = [nspr perl zlib]; buildInputs = [nspr perl zlib];
@ -52,7 +52,7 @@ stdenv.mkDerivation {
mv $out/public $out/include mv $out/public $out/include
mv $out/*.OBJ/* $out/ mv $out/*.OBJ/* $out/
rmdir $out/*.OBJ rmdir $out/*.OBJ
rm -rf $out/bin ${if includeTools then "" else "rm -rf $out/bin"}
# Borrowed from Gentoo. Firefox expects an nss-config script, # Borrowed from Gentoo. Firefox expects an nss-config script,
# but NSS doesn't provide it. # but NSS doesn't provide it.
@ -61,7 +61,7 @@ stdenv.mkDerivation {
NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
mkdir $out/bin ${if includeTools then "" else "mkdir $out/bin"}
cp ${nssConfig} $out/bin/nss-config cp ${nssConfig} $out/bin/nss-config
chmod u+x $out/bin/nss-config chmod u+x $out/bin/nss-config
substituteInPlace $out/bin/nss-config \ substituteInPlace $out/bin/nss-config \

4
pkgs/top-level/all-packages.nix
View File

@ -3505,6 +3505,10 @@ let
nss = callPackage ../development/libraries/nss { }; nss = callPackage ../development/libraries/nss { };
nssTools = callPackage ../development/libraries/nss {
includeTools = true;
};
ode = builderDefsPackage (import ../development/libraries/ode) { ode = builderDefsPackage (import ../development/libraries/ode) {
}; };