Author: eelco Date: Sat Feb 18 18:07:22 2012 New Revision: 32387 URL: https://nixos.org/websvn/nix/?rev=32387&sc=1
Log: * Fix building Firefox 3.6 with GCC 4.6. Added: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix Modified: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix ============================================================================== --- nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix Sat Feb 18 17:45:10 2012 (r32386) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/3.6.nix Sat Feb 18 18:07:22 2012 (r32387) @@ -12,14 +12,14 @@ rec { - firefoxVersion = "3.6.21"; + firefoxVersion = "3.6.27"; - xulVersion = "1.9.2.21"; # this attribute is used by other packages + xulVersion = "1.9.2.27"; # this attribute is used by other packages src = fetchurl { url = "http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.bz2"; - sha1 = "3c1f001ad22d93b48e191999f548b4382db3d36c"; + sha1 = "dd472a10e4ef5b017f00074d0325be13e832d610"; }; @@ -50,6 +50,9 @@ ./xulrunner-chromium-mips.patch ./xulrunner-mips-n32.patch ./xulrunner-1.9.2_beta4-mips-bus-error.patch + + # Fix building on GCC 4.6. + ./gcc-4.6.patch ]; buildInputs = Added: nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/firefox/gcc-4.6.patch Sat Feb 18 18:07:22 2012 (r32387) @@ -0,0 +1,13 @@ +https://346825.bugs.gentoo.org/attachment.cgi?id=270163 + +--- a/gfx/ots/src/os2.cc ++++ b/gfx/ots/src/os2.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <cstddef> ++ + #include "os2.h" + + #include "head.h" _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits