diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-11 18:01:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-11 18:01:50 +0000 |
| commit | b0f16e56b029b7d8a8d4be05a03e102963627b98 (patch) | |
| tree | 5e40fee7e15970ada2fc64ba955a49488c71ba0e /pkgs/development/libraries/glib | |
| parent | baccb31d346f4cde85224e3da3f4c2b49d5a1589 (diff) | |
| parent | 15bfb025abc83035ac77b1c25f706a2e0085daa9 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index de5e0b781f8dc..489b3154f0d72 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -19,6 +19,7 @@ , desktop-file-utils, shared-mime-info , darwin , makeHardcodeGsettingsPatch +, testers }: assert stdenv.isLinux -> util-linuxMinimal != null; @@ -266,7 +267,10 @@ stdenv.mkDerivation (finalAttrs: { getSchemaPath = pkg: makeSchemaPath pkg pkg.name; getSchemaDataDirPath = pkg: makeSchemaDataDirPath pkg pkg.name; - tests.withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + tests = { + withChecks = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; inherit flattenInclude; updateScript = gnome.updateScript { @@ -292,6 +296,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://wiki.gnome.org/Projects/GLib"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); + pkgConfigModules = [ + "gio-2.0" + "gobject-2.0" + "gthread-2.0" + ]; platforms = platforms.unix; longDescription = '' |