diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-02-12 14:23:58 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-02-13 10:24:55 -0500 |
| commit | fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3 (patch) | |
| tree | 1203c65e57d6136f7746878b84f9f4e8e4a98239 | |
| parent | d0e7867130f192a17c63d93ee47dc1e5d077d781 (diff) | |
| download | nixpkgs-fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3.tar nixpkgs-fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3.tar.gz nixpkgs-fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3.tar.bz2 nixpkgs-fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3.tar.lz nixpkgs-fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3.tar.xz nixpkgs-fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3.tar.zst nixpkgs-fd34bbb0adccf16d34d4b758ac5868cb2f43f2e3.zip | |
icu: Add `meta.pkgConfigModules` and test
| -rw-r--r-- | pkgs/development/libraries/icu/63.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/icu/base.nix | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 19838763f5b..a83e2cd5f5e 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, buildRootOnly ? false }: +{ stdenv, lib, fetchurl, fetchpatch, fixDarwinDylibNames, nativeBuildRoot, testers +, buildRootOnly ? false +}: import ./base.nix { version = "63.1"; @@ -11,4 +13,4 @@ import ./base.nix { }) ]; patchFlags = [ "-p3" ]; -} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot buildRootOnly; } +} { inherit stdenv lib fetchurl fixDarwinDylibNames nativeBuildRoot testers buildRootOnly; } diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index a714e758bd8..c5e46fa4530 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -2,6 +2,7 @@ { stdenv, lib, fetchurl, fixDarwinDylibNames # Cross-compiled icu4c requires a build-root of a native compile , buildRootOnly ? false, nativeBuildRoot +, testers }: let @@ -45,6 +46,11 @@ let description = "Unicode and globalization support library"; homepage = "https://icu.unicode.org/"; maintainers = with maintainers; [ raskin ]; + pkgConfigModules = [ + "icu-i18n" + "icu-io" + "icu-uc" + ]; platforms = platforms.all; }; }; @@ -97,4 +103,6 @@ let then buildRootOnlyAttrs else realAttrs; in -stdenv.mkDerivation attrs +stdenv.mkDerivation (finalAttrs: attrs // { + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; +}) |