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