about summary refs log tree commit diff
path: root/pkgs/development/libraries/libunwind
diff options
context:
space:
mode:
authorNikolay Amiantov <ab@fmap.me>2015-09-03 14:26:38 +0300
committerNikolay Amiantov <ab@fmap.me>2015-09-04 03:52:25 +0300
commitec3ffeb19966ded0970cb4f214f2b712aaa93c6c (patch)
treebf0d9a32c0c6bb89f5c287dafb80a34b7857aa22 /pkgs/development/libraries/libunwind
parenta1c92c4593b8cda29187d757771329d1634c5689 (diff)
downloadnixlib-ec3ffeb19966ded0970cb4f214f2b712aaa93c6c.tar
nixlib-ec3ffeb19966ded0970cb4f214f2b712aaa93c6c.tar.gz
nixlib-ec3ffeb19966ded0970cb4f214f2b712aaa93c6c.tar.bz2
nixlib-ec3ffeb19966ded0970cb4f214f2b712aaa93c6c.tar.lz
nixlib-ec3ffeb19966ded0970cb4f214f2b712aaa93c6c.tar.xz
nixlib-ec3ffeb19966ded0970cb4f214f2b712aaa93c6c.tar.zst
nixlib-ec3ffeb19966ded0970cb4f214f2b712aaa93c6c.zip
libunwind: add a patch to address https://github.com/JuliaLang/julia/issues/3469
Should be beneficial to other LLVM+libunwind projects as well (e.g. Pyston)
Diffstat (limited to 'pkgs/development/libraries/libunwind')
-rw-r--r--pkgs/development/libraries/libunwind/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index ecaa643b143f..3fc8b5085590 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xz }:
+{ stdenv, fetchurl, fetchpatch, xz }:
 
 stdenv.mkDerivation rec {
   name = "libunwind-1.1";
@@ -8,7 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx";
   };
 
-  patches = [ ./libunwind-1.1-lzma.patch ./cve-2015-3239.patch ];
+  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";
+              })
+            ];
 
   postPatch = ''
     sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure