pkg-configPackages -> defaultPkgConfigPackages
This better reflects the purpose of the package set, while leaving room for a fancier, more complete implementation of the concept, with a nicer name.
This commit is contained in:
parent
90fdbf5f39
commit
a010129bf8
4 changed files with 6 additions and 6 deletions
|
@ -6,4 +6,4 @@ Nixpkgs provides a couple of facilities for working with this tool.
|
|||
|
||||
- A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment.
|
||||
- The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules.
|
||||
- The `pkg-configPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead.
|
||||
- The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead.
|
||||
|
|
|
@ -51,9 +51,9 @@ with pkgs;
|
|||
|
||||
php = recurseIntoAttrs (callPackages ./php {});
|
||||
|
||||
pkg-configPackages =
|
||||
defaultPkgConfigPackages =
|
||||
let
|
||||
# pkg-configPackages test needs a Nixpkgs with allowUnsupportedPlatform
|
||||
# defaultPkgConfigPackages test needs a Nixpkgs with allowUnsupportedPlatform
|
||||
# in order to filter out the unsupported packages without throwing any errors
|
||||
# tryEval would be too fragile, masking different problems as if they're
|
||||
# unsupported platform problems.
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ lib, pkg-config, pkg-configPackages, runCommand }:
|
||||
{ lib, pkg-config, defaultPkgConfigPackages, runCommand }:
|
||||
let
|
||||
inherit (lib.strings) escapeNixIdentifier;
|
||||
|
||||
allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) pkg-configPackages;
|
||||
allTests = lib.mapAttrs (k: v: if v == null then null else makePkgConfigTestMaybe k v) defaultPkgConfigPackages;
|
||||
|
||||
# nix-build rejects attribute names with periods
|
||||
# This will build those regardless.
|
||||
|
|
|
@ -112,7 +112,7 @@ with pkgs;
|
|||
|
||||
tests = callPackages ../test {};
|
||||
|
||||
pkg-configPackages = import ./pkg-config-packages.nix pkgs;
|
||||
defaultPkgConfigPackages = import ./pkg-config-packages.nix pkgs;
|
||||
|
||||
### Nixpkgs maintainer tools
|
||||
|
||||
|
|
Loading…
Reference in a new issue