From e84663923608b95666f17bf4e2183aa2a93faf3c Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Sat, 27 Apr 2024 12:13:26 -0400 Subject: [PATCH] sbcl: remove obsolete version checks --- pkgs/development/compilers/sbcl/default.nix | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index f22a455e4503..8343c01325e4 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -6,8 +6,8 @@ # Note that the created binaries still need `patchelf --set-interpreter ...` # to get rid of ${glibc} dependency. , purgeNixReferences ? false -, coreCompression ? lib.versionAtLeast version "2.2.6" -, markRegionGC ? lib.versionAtLeast version "2.4.0" +, coreCompression ? true +, markRegionGC ? true , version # Set this to a lisp binary to use a custom bootstrap lisp compiler for # SBCL. Leave as null to use the default. This is useful for local development @@ -173,15 +173,8 @@ stdenv.mkDerivation (self: rec { "--arch=arm64" ]; - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (lib.versionOlder self.version "2.1.10") [ - # Workaround build failure on -fno-common toolchains like upstream - # clang-13. Without the change build fails as: - # duplicate symbol '_static_code_space_free_pointer' in: alloc.o traceroot.o - # Should be fixed past 2.1.10 release. - "-fcommon" - ] - # Fails to find `O_LARGEFILE` otherwise. - ++ [ "-D_GNU_SOURCE" ]); + # Fails to find `O_LARGEFILE` otherwise. + env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; buildPhase = '' runHook preBuild