diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-21 18:07:05 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-21 18:07:25 +0200 |
| commit | f4b5671b0d9e8904a4ad6b3fd852685ec75b517b (patch) | |
| tree | fb26e6573111b29ef3a62d077e8c8ddce2f76103 /pkgs | |
| parent | 454590f8845bb8c07d34e97e46bbd0dc8d2a05c8 (diff) | |
| download | nixlib-f4b5671b0d9e8904a4ad6b3fd852685ec75b517b.tar nixlib-f4b5671b0d9e8904a4ad6b3fd852685ec75b517b.tar.gz nixlib-f4b5671b0d9e8904a4ad6b3fd852685ec75b517b.tar.bz2 nixlib-f4b5671b0d9e8904a4ad6b3fd852685ec75b517b.tar.lz nixlib-f4b5671b0d9e8904a4ad6b3fd852685ec75b517b.tar.xz nixlib-f4b5671b0d9e8904a4ad6b3fd852685ec75b517b.tar.zst nixlib-f4b5671b0d9e8904a4ad6b3fd852685ec75b517b.zip | |
firefox: Fix build on 32-bit by using the gold linker
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index c1458fd2fba0..e176cbdfe8a0 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] 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" ]) ++ lib.optional enableOfficialBranding "--enable-official-branding"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1f50a2a91ab..f51b47ea4cf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9286,6 +9286,7 @@ let firefox13Wrapper = wrapFirefox { browser = firefox13Pkgs.firefox; }; firefox = callPackage ../applications/networking/browsers/firefox { + stdenv = useGoldLinker stdenv; inherit (gnome) libIDL; inherit (pythonPackages) pysqlite; }; |