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, libtool, gtk3, libpcap, goocanvas2,
|
||||
{ lib, stdenv, fetchurl, pkg-config, libtool, gtk3, libpcap, goocanvas2,
|
||||
popt, itstool, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0w63vg2q6if3wvy2md66in8b6cdw9q40hny5xy6yrxky58l4kmg7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ itstool pkgconfig (lib.getBin libxml2) ];
|
||||
nativeBuildInputs = [ itstool pkg-config (lib.getBin libxml2) ];
|
||||
buildInputs = [
|
||||
libtool gtk3 libpcap goocanvas2 popt
|
||||
];
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libpcap, libnet, zlib, curl, pcre
|
||||
, openssl, ncurses, glib, gtk3, atk, pango, flex, bison, geoip, harfbuzz
|
||||
, pkgconfig }:
|
||||
, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ettercap";
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ cmake flex bison pkgconfig ];
|
||||
nativeBuildInputs = [ cmake flex bison pkg-config ];
|
||||
buildInputs = [
|
||||
libpcap libnet zlib curl pcre openssl ncurses
|
||||
glib gtk3 atk pango geoip harfbuzz
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd
|
||||
{ lib, stdenv, fetchurl, pkg-config, libpcap, pcre, libnl, zlib, libmicrohttpd
|
||||
, sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils
|
||||
, withNetworkManager ? false, glib, networkmanager
|
||||
, withPython ? false, python3
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1n6y6sgqf50bng8n0mhs2r1w0ak14mv654sqay72a78wh2s7ywzg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
|
||||
{ lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares
|
||||
, gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib
|
||||
, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper
|
||||
, withQt ? true, qt5 ? null
|
||||
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
|
||||
NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison cmake flex pkgconfig
|
||||
bison cmake flex pkg-config
|
||||
] ++ optional withQt qt5.wrapQtAppsHook;
|
||||
|
||||
buildInputs = [
|
||||
|
||||
Reference in New Issue
Block a user