From 08ba4f13c97b41079fac5440f059e09ff56e23ca Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Wed, 23 Jan 2019 01:04:04 +0100
Subject: [PATCH] firefoxPackages: support building with firefox 65
Firefox >=65 will depend on icu >=63. All the older firefox versions
(and derived packages) seem to work fine with this change.
Also the system path environment patch will fail to apply since there
was a trivial whitespace change in the source file. By adding `-l` to
patch we can avoid having to track two patches that do basically the
same. Having patchFlags per file without resorting to pre-/postPatch
would be nicer but there doesn't seem to be a facility for that right
now.
---
pkgs/applications/networking/browsers/firefox/common.nix | 5 +++++
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index b3719e841e58..933d16c027ee 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -87,6 +87,11 @@ stdenv.mkDerivation rec {
inherit src unpackPhase patches meta;
+ # Ignore trivial whitespace changes in patches, this fixes compatibility of
+ # ./env_var_for_system_dir.patch with Firefox >=65 without having to track
+ # two patches.
+ patchFlags = [ "-p1" "-l" ];
+
buildInputs = [
gtk2 perl zip libIDL libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9621ca428aa6..e407c9dc44e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17130,7 +17130,7 @@ in
libpng = libpng_apng;
python = python2;
gnused = gnused_422;
- icu = icu59;
+ icu = icu63;
inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
Kerberos AVFoundation MediaToolbox
CoreLocation Foundation AddressBook;