diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2019-05-21 08:55:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 08:55:57 +0200 |
| commit | 3906e98c008153cd2a5cbffba928234f25b6e16a (patch) | |
| tree | c4d75406e47277cb776a1e297778f03aae953ccb /pkgs/applications/networking/browsers/firefox/common.nix | |
| parent | d16a78b51219ec382709c67901a5ce0b1f74802c (diff) | |
| parent | e57d93af0ce6d06b00690beb800ab6a629944c90 (diff) | |
| download | nixlib-3906e98c008153cd2a5cbffba928234f25b6e16a.tar nixlib-3906e98c008153cd2a5cbffba928234f25b6e16a.tar.gz nixlib-3906e98c008153cd2a5cbffba928234f25b6e16a.tar.bz2 nixlib-3906e98c008153cd2a5cbffba928234f25b6e16a.tar.lz nixlib-3906e98c008153cd2a5cbffba928234f25b6e16a.tar.xz nixlib-3906e98c008153cd2a5cbffba928234f25b6e16a.tar.zst nixlib-3906e98c008153cd2a5cbffba928234f25b6e16a.zip | |
firefox: 66.0.5 -> 67.0,firefox-bin: 66.0.5 -> 67.0, firefox-esr-60: 60.6.3esr -> 60.7.0esr (#61757)
firefox: 66.0.5 -> 67.0,firefox-bin: 66.0.5 -> 67.0, firefox-esr-60: 60.6.3esr -> 60.7.0esr
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 = '' |