diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-09-17 22:18:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-17 22:18:00 +0100 |
| commit | 87ed5ba575c9c9b8b651683db54d1db2b5b7ab34 (patch) | |
| tree | bb2ca96d86882802707707dde3e58efb427bf78d /pkgs/applications | |
| parent | 8a948668174cc180e884bc068145bb0c85d928d0 (diff) | |
| parent | ffafe959ee302fe645a77dfae9a719b5d6709fa3 (diff) | |
| download | nixlib-87ed5ba575c9c9b8b651683db54d1db2b5b7ab34.tar nixlib-87ed5ba575c9c9b8b651683db54d1db2b5b7ab34.tar.gz nixlib-87ed5ba575c9c9b8b651683db54d1db2b5b7ab34.tar.bz2 nixlib-87ed5ba575c9c9b8b651683db54d1db2b5b7ab34.tar.lz nixlib-87ed5ba575c9c9b8b651683db54d1db2b5b7ab34.tar.xz nixlib-87ed5ba575c9c9b8b651683db54d1db2b5b7ab34.tar.zst nixlib-87ed5ba575c9c9b8b651683db54d1db2b5b7ab34.zip | |
Merge pull request #46647 from symphorien/rust-1.29
rustc: 1.27 -> 1.29
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 11222cc65ba3..e5095323cc43 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -28,6 +28,12 @@ rec { patches = nixpkgsPatches ++ [ ./no-buildconfig.patch + # fix build with rust >= 1.29 and firefox < 63 + # https://bugzilla.mozilla.org/show_bug.cgi?id=1479540 + (fetchpatch { + url = "https://github.com/mozilla/gecko-dev/commit/eec0d4f8714e6671402d41632232ef57348e65c4.patch"; + sha256 = "1cjaqx811bcnp8b6z16q25csaclaic3b11q45ck02srd99n8qp0j"; + }) ]; extraNativeBuildInputs = [ python3 ]; |