From 636ae809405418c082af6120b7164e84d3144af1 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 31 Jan 2019 07:07:01 -0600 Subject: [PATCH] llvm7: replace patch with official upstream commit Hopefully this also addresses any problems enountered with the patch used previously. --- pkgs/development/compilers/llvm/7/llvm.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 533333d49723..5bb629931fd5 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -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 {