diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2019-05-17 12:46:08 +0200 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2019-05-20 18:29:25 +0200 |
| commit | 7f65d06c4f6b3e9760926ac65a0f78c700f445b9 (patch) | |
| tree | 666cea14312194e40624a09fb5b34325f4e0442b /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | 81d4e65891f92e8e72c244da663c83c1e40dc919 (diff) | |
| download | nixlib-7f65d06c4f6b3e9760926ac65a0f78c700f445b9.tar nixlib-7f65d06c4f6b3e9760926ac65a0f78c700f445b9.tar.gz nixlib-7f65d06c4f6b3e9760926ac65a0f78c700f445b9.tar.bz2 nixlib-7f65d06c4f6b3e9760926ac65a0f78c700f445b9.tar.lz nixlib-7f65d06c4f6b3e9760926ac65a0f78c700f445b9.tar.xz nixlib-7f65d06c4f6b3e9760926ac65a0f78c700f445b9.tar.zst nixlib-7f65d06c4f6b3e9760926ac65a0f78c700f445b9.zip | |
firefox: prepare for firefox 67.0 release
Firefox now requires `llvm-objdump` during the build phase. The aarch64 patches do no longer apply. So far I am guessing that they have been merged. We should verify that.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c0cfcf412c5e..6e39904d27ba 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,7 +94,7 @@ let browserPatches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66") [ + ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ (fetchpatch { url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; @@ -164,6 +164,7 @@ stdenv.mkDerivation rec { ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] + ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; preConfigure = '' |