From 580d05f24ca3e198a1be5fecc4f7b044104cb55b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 28 Oct 2025 19:46:43 +0100 Subject: [PATCH] mmseqs2: avoid pkgsStatic Pulling in a zstd built with possibly a different libc, from an entirely different package set and putting it in nativeBuildInputs is.. brave! --- pkgs/by-name/mm/mmseqs2/package.nix | 31 +++++++++++++++-------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix index 474afc3b4798..51680a5818d5 100644 --- a/pkgs/by-name/mm/mmseqs2/package.nix +++ b/pkgs/by-name/mm/mmseqs2/package.nix @@ -16,12 +16,12 @@ llvmPackages, zlib, bzip2, - pkgsStatic, + zstd, runCommand, -}: +}@args: let # require static library, libzstd.a - inherit (pkgsStatic) zstd; + zstd = args.zstd.override { enableStatic = true; }; in stdenv.mkDerivation (finalAttrs: { @@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: { xxd perl installShellFiles - zstd ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_nvcc @@ -58,17 +57,19 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString) ]; - buildInputs = - lib.optionals stdenv.cc.isClang [ - llvmPackages.openmp - zlib - bzip2 - ] - ++ lib.optional enableMpi mpi - ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cudart - cudaPackages.cuda_cccl - ]; + buildInputs = [ + zstd + ] + ++ lib.optionals stdenv.cc.isClang [ + llvmPackages.openmp + zlib + bzip2 + ] + ++ lib.optional enableMpi mpi + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + cudaPackages.cuda_cccl + ]; postInstall = '' installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh