From 2a82be9af1a3032810052a94093e040b7a32510c Mon Sep 17 00:00:00 2001 From: Nathan Zadoks Date: Sat, 3 Dec 2016 19:55:51 -0500 Subject: [PATCH] libunwind: add AArch64 support patch --- pkgs/development/libraries/libunwind/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 6ed29a8abc3..419a14551ba 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xz }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, xz }: stdenv.mkDerivation rec { name = "libunwind-1.1"; @@ -8,13 +8,18 @@ stdenv.mkDerivation rec { sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx"; }; + buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook; + patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch # https://lists.nongnu.org/archive/html/libunwind-devel/2014-04/msg00000.html (fetchpatch { url = "https://raw.githubusercontent.com/dropbox/pyston/1b2e676417b0f5f17526ece0ed840aa88c744145/libunwind_patches/0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch"; sha256 = "1a0fsgfxmgd218nscswx7pgyb7rcn2gh6566252xhfvzhgn5i4ha"; }) - ]; + ] ++ stdenv.lib.optional stdenv.isAarch64 (fetchpatch { + url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/77709d1c6d5c39e23c1535b1bd584be1455f2551/extra/libunwind/libunwind-aarch64.patch"; + sha256 = "1mpjs8izq9wxiaf5rl4gzaxrkz0s51f9qz5qc5dj72pr84mw50w8"; + }); postPatch = '' sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure