From e0fd84cf439f39d31e2c317b228b0c035cc6211d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 10 Jan 2019 12:05:31 +0100
Subject: sbcl: fix a thread safety bug with an upstream patch

---
 pkgs/development/compilers/sbcl/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'pkgs/development/compilers/sbcl')

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 3283555cd6ee5..5f1c35815c32e 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, writeText, sbclBootstrap
+{ stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
 , threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system)
   # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
@@ -19,7 +19,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [texinfo];
 
+  patches = [
+    # 1.4.15 bug, run-program thread safety, remove for 1.4.16
+    (fetchpatch {
+      url = "https://github.com/sbcl/sbcl/commit/c80672bedb1e4bc16124d0d01d7e37f94dd17a5a.patch";
+      sha256 = "0pjm9yajwij59gdkqhid7sbgmb8z57cz8zrsikxg7yzfgr7sa7hy";
+    })
+  ];
+
   patchPhase = ''
+    for patch in ${toString patches}; do
+      patch -Np1 -i "$patch"
+    done
+
     echo '"${version}.nixos"' > version.lisp-expr
     echo "
     (lambda (features)
-- 
cgit 1.4.1