From f15f81efb8918ecd9d9ba6cb5530c7be27ddbf8d Mon Sep 17 00:00:00 2001 From: qbisi Date: Wed, 4 Jun 2025 22:24:38 +0800 Subject: [PATCH] c-blosc: partially revert "c-blosc2: add cmake-config and propagate buildInputs" partially revert commit https://github.com/NixOS/nixpkgs/commit/bb3d46c9943623f078d3fcd46a336b3c5d9346c0. c-blosc does not provide a *cmake.config module and should not propagate lz4, zlib, zstd. --- pkgs/development/libraries/c-blosc/1.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix index 6349063e3dd9..169f27b0f937 100644 --- a/pkgs/development/libraries/c-blosc/1.nix +++ b/pkgs/development/libraries/c-blosc/1.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ + buildInputs = [ lz4 zlib zstd @@ -54,19 +54,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !static; - passthru.tests = { - pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - cmake-config = testers.hasCmakeConfigModules { - moduleNames = [ "Blosc2" ]; - package = finalAttrs.finalPackage; - }; - }; + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = with lib; { description = "Blocking, shuffling and loss-less compression library"; homepage = "https://www.blosc.org"; changelog = "https://github.com/Blosc/c-blosc/releases/tag/v${finalAttrs.version}"; - pkgConfigModules = [ "blosc2" ]; + pkgConfigModules = [ "blosc" ]; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ ris ];