summary refs log tree commit diff
diff options
context:
space:
mode:
authorKeshav Kini <keshav.kini@gmail.com>2021-08-14 23:47:36 -0700
committerKeshav Kini <keshav.kini@gmail.com>2021-08-15 12:15:37 -0700
commit0964eae237bb7c9a1b49af954b3f9af044f4aa44 (patch)
tree2c14d2e81478bfce18149708247623383147c98d
parent3ab8ce12c2db31268f579c11727d9c63cfee2eee (diff)
downloadnixpkgs-0964eae237bb7c9a1b49af954b3f9af044f4aa44.tar
nixpkgs-0964eae237bb7c9a1b49af954b3f9af044f4aa44.tar.gz
nixpkgs-0964eae237bb7c9a1b49af954b3f9af044f4aa44.tar.bz2
nixpkgs-0964eae237bb7c9a1b49af954b3f9af044f4aa44.tar.lz
nixpkgs-0964eae237bb7c9a1b49af954b3f9af044f4aa44.tar.xz
nixpkgs-0964eae237bb7c9a1b49af954b3f9af044f4aa44.tar.zst
nixpkgs-0964eae237bb7c9a1b49af954b3f9af044f4aa44.zip
sbcl: backport ARM segfault fix for large cores
-rw-r--r--pkgs/development/compilers/sbcl/common.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/compilers/sbcl/common.nix b/pkgs/development/compilers/sbcl/common.nix
index eb3f6aba200..d81d1bf8f63 100644
--- a/pkgs/development/compilers/sbcl/common.nix
+++ b/pkgs/development/compilers/sbcl/common.nix
@@ -1,6 +1,6 @@
 { version, sha256 }:
 
-{ lib, stdenv, fetchurl, writeText, sbclBootstrap
+{ lib, 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 || "aarch64-darwin" == stdenv.hostPlatform.system)
 , disableImmobileSpace ? false
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [texinfo];
 
+  patches = lib.optional
+    (lib.versionAtLeast version "2.1.2" && lib.versionOlder version "2.1.8")
+    (fetchpatch {
+      # Fix segfault on ARM when reading large core files
+      url = "https://github.com/sbcl/sbcl/commit/8fa3f76fba2e8572e86ac6fc5754e6b2954fc774.patch";
+      sha256 = "1ic531pjnws1k3xd03a5ixbq8cn10dlh2nfln59k0vbm0253g3lv";
+    });
+
   postPatch = ''
     echo '"${version}.nixos"' > version.lisp-expr