Merge pull request #54998 from dtzWill/fix/llvm7-optional-round-2

llvm7: replace patch with official upstream commit
This commit is contained in:
Will Dietz 2019-01-31 13:44:40 -06:00 committed by GitHub
commit 442a74bdf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -49,9 +49,10 @@ in stdenv.mkDerivation (rec {
patches = [
# https://bugs.llvm.org/show_bug.cgi?id=39427
# https://github.com/NixOS/nixpkgs/issues/54370
(fetchpatch {
url = "https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/raw/5a7d283d4e00bc4822c7b0226e593c344c8f6050/debian/patches/pr39427-misscompile.diff";
sha256 = "03mpydsaw0xvcp7kb4sgjzcl5v22620r5z78kv3mz5wp7sn76fg5";
url = "https://github.com/llvm-mirror/llvm/commit/57567def148f387153a8149fb590bd39b1b006a1.patch";
sha256 = "1w1xg5pxpc6cals1nf5j5k4p6qi8lcrpvn0paxc86m415i79xmcg";
})
# backport, fix building rust crates with lto
(fetchpatch {