From 2d4e578c1291b13331dc18c77270d0ed406826db Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:48:38 +0200 Subject: [PATCH 1/2] lerc: move to finalAttrs We'll need to use finalPackage if we want to test for the presence of pkg-config files via passthru.tests. --- pkgs/development/libraries/lerc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/development/libraries/lerc/default.nix index f7bba5125a72..031f8531b1a9 100644 --- a/pkgs/development/libraries/lerc/default.nix +++ b/pkgs/development/libraries/lerc/default.nix @@ -5,7 +5,7 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lerc"; version = "4.0.0"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "esri"; repo = "lerc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-IHY9QtNYsxPz/ksxRMZGHleT+/bawfTYNVRSTAuYQ7Y="; }; @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; }; -} +}) From e778af3e6a74523aabf80179f873b20241570130 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Jul 2024 23:50:06 +0200 Subject: [PATCH 2/2] lerc: expose available pkg-config modules via meta --- pkgs/development/libraries/lerc/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/lerc/default.nix b/pkgs/development/libraries/lerc/default.nix index 031f8531b1a9..463344f5b7f6 100644 --- a/pkgs/development/libraries/lerc/default.nix +++ b/pkgs/development/libraries/lerc/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , fetchpatch , cmake +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -31,10 +32,15 @@ stdenv.mkDerivation (finalAttrs: { cmake ]; + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + meta = { description = "C++ library for Limited Error Raster Compression"; homepage = "https://github.com/esri/lerc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dotlambda ]; + pkgConfigModules = [ "Lerc" ]; }; })