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

firefox: Fix build on 32-bit by using the gold linker

Browse Source
This commit is contained in:
Eelco Dolstra 2014-10-21 18:07:05 +02:00
parent 454590f884
commit f4b5671b0d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox/default.nix
View File

@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
] ]
++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
else [ "--disable-debug" "--enable-release" else [ "--disable-debug" "--enable-release"
"--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O3"}" "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}"
"--enable-strip" ]) "--enable-strip" ])
++ lib.optional enableOfficialBranding "--enable-official-branding"; ++ lib.optional enableOfficialBranding "--enable-official-branding";

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

@ -9286,6 +9286,7 @@ let
firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; };
firefox = callPackage ../applications/networking/browsers/firefox { firefox = callPackage ../applications/networking/browsers/firefox {
stdenv = useGoldLinker stdenv;
inherit (gnome) libIDL; inherit (gnome) libIDL;
inherit (pythonPackages) pysqlite; inherit (pythonPackages) pysqlite;
}; };