Merge branch 'philip/linux' (#3054)

* origin/philip/linux:
  libsigsegv: disable stack vma check

Signed-off-by: Philip Monk <phil@pcmonk.me>

nix/nixcrpkgs/pkgs/libsigsegv/builder.sh

@@ -2,6 +2,21 @@ source $setup
 
 tar -xf $src
 
+cd libsigsegv-$version
+patch -p1 << 'HEREDOC'
+--- a/src/fault-linux-i386.h    2020-06-25 23:46:02.099235491 +0000
++++ b/src/fault-linux-i386.h    2020-06-25 23:45:48.679156892 +0000
+@@ -18,6 +18,7 @@
+
+ #include "fault-posix-ucontext.h"
+
++#define HAVE_STACKVMA 0
+ #if defined __x86_64__
+ /* 64 bit registers */
+
+HEREDOC
+cd ..
+
 mkdir build
 cd build
 

nix/pkgs/urbit/default.nix

@@ -16,9 +16,14 @@ let
     exe   = ''${meta.bin} ${pkgs.lib.strings.concatStringsSep " " meta.flags}'';
   };
 
+  sigseg =
+    pkgs.libsigsegv.overrideAttrs (oldAttrs: rec {
+      patches = [ ./libsigsegv_fix.patch ];
+    });
+
   deps =
     with pkgs;
-    [ curl gmp libsigsegv ncurses openssl zlib lmdb ];
+    [ curl gmp sigseg ncurses openssl zlib lmdb ];
 
   vendor =
     [ argon2 softfloat3 ed25519 ent ge-additions libaes_siv h2o scrypt uv murmur3 secp256k1 sni ivory-header ca-header ];

nix/pkgs/urbit/libsigsegv_fix.patch

@@ -0,0 +1,10 @@
+--- a/src/fault-linux-i386.h    2020-06-25 23:46:02.099235491 +0000
++++ b/src/fault-linux-i386.h    2020-06-25 23:45:48.679156892 +0000
+@@ -18,6 +18,7 @@
+
+ #include "fault-posix-ucontext.h"
+
++#define HAVE_STACKVMA 0
+ #if defined __x86_64__
+ /* 64 bit registers */
+