lol

geos: Add `meta.pkgConfigModules` and test

+20 -8
+11 -4
pkgs/development/libraries/geos/3.9.nix
··· 1 - { lib, stdenv, fetchurl }: 1 + { lib 2 + , stdenv 3 + , fetchurl 4 + , testers 5 + }: 2 6 3 - stdenv.mkDerivation rec { 7 + stdenv.mkDerivation (finalAttrs: { 4 8 pname = "geos"; 5 9 version = "3.9.2"; 6 10 7 11 src = fetchurl { 8 - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; 12 + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; 9 13 sha256 = "sha256-RKWpviHX1HNDa/Yhwt3MPPWou+PHhuEyKWGKO52GEpc="; 10 14 }; 11 15 ··· 13 17 14 18 # https://trac.osgeo.org/geos/ticket/993 15 19 configureFlags = lib.optional stdenv.isAarch32 "--disable-inline"; 20 + 21 + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 16 22 17 23 meta = with lib; { 18 24 description = "C++ port of the Java Topology Suite (JTS)"; 19 25 homepage = "https://trac.osgeo.org/geos"; 20 26 license = licenses.lgpl21Only; 27 + pkgConfigModules = [ "geos" ]; 21 28 maintainers = with lib.maintainers; [ 22 29 willcohen 23 30 ]; 24 31 }; 25 - } 32 + })
+9 -4
pkgs/development/libraries/geos/default.nix
··· 2 2 , stdenv 3 3 , fetchurl 4 4 , fetchpatch 5 - , cmake }: 5 + , cmake 6 + , testers 7 + }: 6 8 7 - stdenv.mkDerivation rec { 9 + stdenv.mkDerivation (finalAttrs: { 8 10 pname = "geos"; 9 11 version = "3.11.1"; 10 12 11 13 src = fetchurl { 12 - url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; 14 + url = "https://download.osgeo.org/geos/${finalAttrs.pname}-${finalAttrs.version}.tar.bz2"; 13 15 hash = "sha256-bQ6zz6n5LZR3Mcx18XUDVrO9/AfqAgVT2vavHHaOC+I="; 14 16 }; 15 17 16 18 nativeBuildInputs = [ cmake ]; 17 19 18 20 doCheck = true; 21 + 22 + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; 19 23 20 24 meta = with lib; { 21 25 description = "C++ port of the Java Topology Suite (JTS)"; 22 26 homepage = "https://trac.osgeo.org/geos"; 23 27 license = licenses.lgpl21Only; 28 + pkgConfigModules = [ "geos" ]; 24 29 maintainers = with lib.maintainers; [ 25 30 willcohen 26 31 ]; 27 32 }; 28 - } 33 + })