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:
committed by
Jonathan Ringer
parent
200bb8c977
commit
9bb3fccb5b
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, cmake, bison, pkgconfig
|
||||
{ lib, stdenv, fetchurl, cmake, bison, pkg-config
|
||||
, boost, libedit, libevent, lz4, ncurses, openssl, protobuf, readline, zlib, perl
|
||||
, cctools, CoreServices, developer_cmds
|
||||
, libtirpc, rpcsvc-proto
|
||||
@@ -21,7 +21,7 @@ self = stdenv.mkDerivation rec {
|
||||
export PATH=$PATH:$TMPDIR
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake bison pkgconfig rpcsvc-proto ];
|
||||
nativeBuildInputs = [ cmake bison pkg-config rpcsvc-proto ];
|
||||
|
||||
buildInputs = [ boost libedit libevent lz4 ncurses openssl protobuf readline zlib libtirpc ]
|
||||
++ lib.optionals stdenv.isDarwin [ perl cctools CoreServices developer_cmds ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, bison, cmake, pkgconfig
|
||||
{ lib, stdenv, fetchurl, bison, cmake, pkg-config
|
||||
, boost, icu, libedit, libevent, lz4, ncurses, openssl, protobuf, re2, readline, zlib, zstd
|
||||
, numactl, perl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto
|
||||
}:
|
||||
@@ -17,7 +17,7 @@ self = stdenv.mkDerivation rec {
|
||||
./abi-check.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ bison cmake pkgconfig rpcsvc-proto ];
|
||||
nativeBuildInputs = [ bison cmake pkg-config rpcsvc-proto ];
|
||||
|
||||
## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user