From f7ed1663f3ee34178872c35c3a0f1521ea13258e Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 1 Mar 2024 20:09:39 -0500 Subject: [PATCH 1/2] sbcl: assert coreCompression -> !purgeNixReferences --- pkgs/development/compilers/sbcl/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index e8933d045e37..0262584c3e37 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -94,7 +94,14 @@ stdenv.mkDerivation (self: rec { strace ] ); - buildInputs = lib.optionals coreCompression [ zstd ]; + buildInputs = lib.optionals coreCompression ( + # Declare at the point of actual use in case the caller wants to override + # buildInputs to sidestep this. + assert lib.assertMsg (!purgeNixReferences) '' + Cannot enable coreCompression when purging Nix references, because compression requires linking in zlib + ''; + [ zstd ] + ); patches = lib.optionals (lib.versionOlder self.version "2.4.2") [ # Fixed in 2.4.2 From 3349c41fe4a7c37f7d2fc25f5add96c3fb3ff648 Mon Sep 17 00:00:00 2001 From: Hraban Date: Mon, 11 Mar 2024 18:51:40 +0000 Subject: [PATCH 2/2] sbcl: fix comment s/zlib/zstd Co-authored-by: 7c6f434c <7c6f434c@mail.ru> --- pkgs/development/compilers/sbcl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 0262584c3e37..78b3ed07602b 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation (self: rec { # Declare at the point of actual use in case the caller wants to override # buildInputs to sidestep this. assert lib.assertMsg (!purgeNixReferences) '' - Cannot enable coreCompression when purging Nix references, because compression requires linking in zlib + Cannot enable coreCompression when purging Nix references, because compression requires linking in zstd ''; [ zstd ] );