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, pkgconfig, systemd
|
||||
{ lib, stdenv, fetchurl, pkg-config, systemd
|
||||
, boost, libsodium, libedit, re2
|
||||
, net-snmp, lua, protobuf, openssl, zlib, h2o
|
||||
}:
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1wgv19b6y4fp5x1z54psaaialji2rckl5vdh156kyw47k9r5krya";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig protobuf ];
|
||||
nativeBuildInputs = [ pkg-config protobuf ];
|
||||
buildInputs = [ systemd boost libsodium libedit re2 net-snmp lua openssl zlib h2o ];
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
||||
{ lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
|
||||
, systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2
|
||||
, autoreconfHook
|
||||
}:
|
||||
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
||||
./runtime-deps.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [
|
||||
gnutls liburcu libidn2 libunistring
|
||||
nettle libedit
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch
|
||||
# native deps.
|
||||
, runCommand, pkgconfig, meson, ninja, makeWrapper
|
||||
, runCommand, pkg-config, meson, ninja, makeWrapper
|
||||
# build+runtime deps.
|
||||
, knot-dns, luajitPackages, libuv, gnutls, lmdb
|
||||
, systemd, libcap_ng, dns-root-data, nghttp2 # optionals, in principle
|
||||
@@ -50,7 +50,7 @@ unwrapped = stdenv.mkDerivation rec {
|
||||
patchShebangs scripts/
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkgconfig meson ninja ];
|
||||
nativeBuildInputs = [ pkg-config meson ninja ];
|
||||
|
||||
# http://knot-resolver.readthedocs.io/en/latest/build.html#requirements
|
||||
buildInputs = [ knot-dns lua.lua libuv gnutls lmdb ]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, boost, nixosTests
|
||||
{ lib, stdenv, fetchurl, pkg-config, boost, nixosTests
|
||||
, openssl, systemd, lua, luajit, protobuf
|
||||
, enableProtoBuf ? false
|
||||
}:
|
||||
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1kzmliim2pwh04y3y6bpai9fm0qmdicrmff09fv5h5wahi4pzfdh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost openssl systemd
|
||||
lua luajit
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, nixosTests
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, nixosTests
|
||||
, boost, libyamlcpp, libsodium, sqlite, protobuf, openssl, systemd
|
||||
, mysql57, postgresql, lua, openldap, geoip, curl, unixODBC
|
||||
}:
|
||||
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [
|
||||
boost mysql57.connector-c postgresql lua openldap sqlite protobuf geoip
|
||||
libyamlcpp libsodium curl unixODBC openssl systemd
|
||||
|
||||
Reference in New Issue
Block a user