treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix

continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
This commit is contained in:
Jonathan Ringer
2021-01-18 22:50:56 -08:00
committed by Jonathan Ringer
parent 200bb8c977
commit 9bb3fccb5b
1653 changed files with 3872 additions and 3872 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
{ stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib
, installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc
, CoreFoundation, Security
}:
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ];
nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ];
buildInputs = [ cacert file curl python3 openssl zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];

View File

@@ -1,5 +1,5 @@
{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
rustPlatform.buildRustPackage {
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
# rls-rustc links to rustc_private crates
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]
++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);

View File

@@ -2,7 +2,7 @@
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
, fetchurl, file, python3
, darwin, cmake, rust, rustPlatform
, pkgconfig, openssl
, pkg-config, openssl
, which, libffi
, withBundledLLVM ? false
, enableRustcDev ? true
@@ -133,7 +133,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
file python3 rustPlatform.rust.rustc cmake
which libffi removeReferencesTo pkgconfig
which libffi removeReferencesTo pkg-config
];
buildInputs = [ openssl ]