public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70229 from Mic92/thunderbird

Browse Source 
thunderbird: fix build with rustc 1.38
This commit is contained in:
Jörg Thalheim 2019-10-02 08:55:28 +01:00 committed by GitHub
commit 2416faca00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/networking/mailreaders/thunderbird/default.nix
View File

@ -52,6 +52,11 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
# Remove buildconfig.html to prevent a dependency on clang etc. # Remove buildconfig.html to prevent a dependency on clang etc.
./no-buildconfig.patch ./no-buildconfig.patch
(fetchpatch {
# https://phabricator.services.mozilla.com/D47796
url = "https://d3kxowhw4s8amj.cloudfront.net/file/data/a54c6fszaol23yh5aa27/PHID-FILE-sql3i57neyrztfdngrwe/D47796.diff";
sha256 = "18i1bk6rz875dly2vnkrdgbah8kx0lv4akjzl0i9gxc58hi5q3nq";
})
] ]
++ lib.optional (lib.versionOlder version "69") ++ lib.optional (lib.versionOlder version "69")
(fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29