movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

firefoxPackages: support building with firefox 65

Browse source 
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.
This commit is contained in:
Andreas Rammhold 2019-01-23 01:04:04 +01:00
parent 3b1158c8dd
commit 08ba4f13c9
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -87,6 +87,11 @@ stdenv.mkDerivation rec {
inherit src unpackPhase patches meta; 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 = [ buildInputs = [
gtk2 perl zip libIDL libjpeg zlib bzip2 gtk2 perl zip libIDL libjpeg zlib bzip2
dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor

2
pkgs/top-level/all-packages.nix
View file

@ -17130,7 +17130,7 @@ in
libpng = libpng_apng; libpng = libpng_apng;
python = python2; python = python2;
gnused = gnused_422; gnused = gnused_422;
icu = icu59; icu = icu63;
inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling
Kerberos AVFoundation MediaToolbox Kerberos AVFoundation MediaToolbox
CoreLocation Foundation AddressBook; CoreLocation Foundation AddressBook;