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

* NSPR and NSS need to be told explicitly to do a 64-bit build.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16201
This commit is contained in:
Eelco Dolstra 2009-07-07 09:52:20 +00:00
parent aec4341cb4
commit 200ad5eb63
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/firefox/3.5.nix
View File

@ -3,9 +3,10 @@
, freetype, fontconfig, file, alsaLib, nspr, nss , freetype, fontconfig, file, alsaLib, nspr, nss
, # If you want the resulting program to call itself "Firefox" instead , # If you want the resulting program to call itself "Firefox" instead
# of "Deer Park", enable this option. However, those binaries may # of "Shiretoko" or whatever, enable this option. However, those
# not be distributed without permission from the Mozilla Foundation, # binaries may not be distributed without permission from the
# see http://www.mozilla.org/foundation/trademarks/. # Mozilla Foundation, see
# http://www.mozilla.org/foundation/trademarks/.
enableOfficialBranding ? false enableOfficialBranding ? false
}: }:

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

@ -12,7 +12,7 @@ stdenv.mkDerivation {
preConfigure = "cd mozilla/nsprpub"; preConfigure = "cd mozilla/nsprpub";
configureFlags = "--enable-optimize --disable-debug"; configureFlags = "--enable-optimize --disable-debug ${if stdenv.is64bit then "--enable-64bit" else ""}";
postInstall = postInstall =
'' ''

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

@ -26,7 +26,11 @@ stdenv.mkDerivation {
BUILD_OPT = "1"; BUILD_OPT = "1";
makeFlags = "NSPR_CONFIG_STATUS= NSDISTMODE=copy BUILD_OPT=1 SOURCE_PREFIX=\$(out)"; makeFlags =
''
NSPR_CONFIG_STATUS= NSDISTMODE=copy BUILD_OPT=1 SOURCE_PREFIX=\$(out)
${if stdenv.is64bit then "USE_64=1" else ""}
'';
buildFlags = "nss_build_all"; buildFlags = "nss_build_all";
@ -48,6 +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
# 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.
@ -56,6 +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
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 \