nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "firefox: fix on i686"

Browse Source 
Patch is now included upstream.

This reverts commit 0611be740e.
This commit is contained in:
Piotr Bogdan
2017-12-20 13:23:28 +00:00
parent 3682eafc81
commit 72dba1409f
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@@ -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";