public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbcl: fix a thread safety bug with an upstream patch

Browse Source
This commit is contained in:
Michael Raskin 2019-01-10 12:05:31 +01:00
parent c9c1e88dbb
commit e0fd84cf43
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/compilers/sbcl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, writeText, sbclBootstrap { stdenv, fetchurl, fetchpatch, writeText, sbclBootstrap
, sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit" , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
, threadSupport ? (stdenv.isi686 || stdenv.isx86_64 || "aarch64-linux" == stdenv.hostPlatform.system) , 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. # 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]; 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 = '' patchPhase = ''
for patch in ${toString patches}; do
patch -Np1 -i "$patch"
done
echo '"${version}.nixos"' > version.lisp-expr echo '"${version}.nixos"' > version.lisp-expr
echo " echo "
(lambda (features) (lambda (features)