Merge pull request #48763 from tohl/master

sbcl updated, tested on nixos x86_64
This commit is contained in:
Michael Raskin 2018-10-21 07:29:09 +00:00 committed by GitHub
commit 51a3a3ea0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -9,11 +9,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sbcl-${version}"; name = "sbcl-${version}";
version = "1.4.10"; version = "1.4.12";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "1j9wb608pkihpwgzl4qvnr4jl6mb7ngfqy559pxnvmnn1zlyfklh"; sha256 = "0maa4h5zdykq050hdqk5wd74dhl6k7br3qrhfd4f2387skk8ky7a";
}; };
patchPhase = '' patchPhase = ''
@ -87,15 +87,23 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
INSTALL_ROOT=$out sh install.sh INSTALL_ROOT=$out sh install.sh
''
+ stdenv.lib.optionalString (!purgeNixReferences) ''
cp -r src $out/lib/sbcl
cp -r contrib $out/lib/sbcl
cat >$out/lib/sbcl/sbclrc <<EOF
(setf (logical-pathname-translations "SYS")
'(("SYS:SRC;**;*.*.*" #P"$out/lib/sbcl/src/**/*.*")
("SYS:CONTRIB;**;*.*.*" #P"$out/lib/sbcl/contrib/**/*.*")))
EOF
''; '';
# Specifying $SBCL_HOME is only truly needed with `purgeNixReferences = true`. setupHook = stdenv.lib.optional purgeNixReferences (writeText "setupHook.sh" ''
setupHook = writeText "setupHook.sh" ''
addEnvHooks "$targetOffset" _setSbclHome addEnvHooks "$targetOffset" _setSbclHome
_setSbclHome() { _setSbclHome() {
export SBCL_HOME='@out@/lib/sbcl/' export SBCL_HOME='@out@/lib/sbcl/'
} }
''; '');
meta = sbclBootstrap.meta // { meta = sbclBootstrap.meta // {
inherit version; inherit version;