From 72dba1409fe914edc1ef3fee0809db866a4c08ae Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 20 Dec 2017 13:23:28 +0000 Subject: [PATCH] Revert "firefox: fix on i686" Patch is now included upstream. This reverts commit 0611be740ecf223bab89390ad8052881234ad79e. --- .../applications/networking/browsers/firefox/packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 03aac35caea7..f8e6d7f762ac 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }: +{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub }: let common = opts: callPackage (import ./common.nix opts); in @@ -13,11 +13,7 @@ rec { }; patches = - [ ./no-buildconfig.patch ] - ++ lib.optional stdenv.isi686 (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/15517c5a5d37"; - sha256 = "1ba487p3hk4w2w7qqfxgv1y57vp86b8g3xhav2j20qd3j3phbbn7"; - }); + [ ./no-buildconfig.patch ]; meta = { description = "A web browser built from Firefox source tree";