summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/firefox/packages.nix
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2017-08-11 21:06:48 +0200
committerRobin Gloster <mail@glob.in>2017-08-11 21:07:14 +0200
commit0611be740ecf223bab89390ad8052881234ad79e (patch)
tree2712bc446d3fce032aaeacef1808c5e85202e9a3 /pkgs/applications/networking/browsers/firefox/packages.nix
parente8f924aef8858f88dd557504030f4e09fcdb6cf7 (diff)
downloadnixpkgs-0611be740ecf223bab89390ad8052881234ad79e.tar
nixpkgs-0611be740ecf223bab89390ad8052881234ad79e.tar.gz
nixpkgs-0611be740ecf223bab89390ad8052881234ad79e.tar.bz2
nixpkgs-0611be740ecf223bab89390ad8052881234ad79e.tar.lz
nixpkgs-0611be740ecf223bab89390ad8052881234ad79e.tar.xz
nixpkgs-0611be740ecf223bab89390ad8052881234ad79e.tar.zst
nixpkgs-0611be740ecf223bab89390ad8052881234ad79e.zip
firefox: fix on i686
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/packages.nix')
-rw-r--r--pkgs/applications/networking/browsers/firefox/packages.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 70b938bc5de..a5256e19e1b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,4 @@
-{ lib, callPackage, fetchurl, fetchFromGitHub }:
+{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch }:
 
 let common = opts: callPackage (import ./common.nix opts); in
 
@@ -12,6 +12,11 @@ rec {
       sha512 = "2c15cb3e1a9f464f63ff7ac8ccf0625ed845a5cb9b186d7acf121c439cec38bcdeee93630e99dbfd336f1b7e60a7c09822a1eba59f308bba8866f155b2ed1c47";
     };
 
+    patches = lib.optional stdenv.isi686 (fetchpatch {
+      url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37";
+      sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7";
+    });
+
     meta = {
       description = "A web browser built from Firefox source tree";
       homepage = http://www.mozilla.com/en-US/firefox/;