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-19 01:16:25 -08:00
committed by Jonathan Ringer
parent 200bb8c977
commit 9bb3fccb5b
1653 changed files with 3872 additions and 3872 deletions
@@ -1,4 +1,4 @@
{ lib, mkDerivation, fetchFromGitHub, pkgconfig, cmake
{ lib, mkDerivation, fetchFromGitHub, pkg-config, cmake
, libzip, boost, fftw, qtbase, libusb1, libsigrok4dsl
, libsigrokdecode4dsl, python3, fetchpatch
}:
@@ -27,7 +27,7 @@ mkDerivation rec {
./qt515.patch
];
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl
@@ -1,4 +1,4 @@
{ lib, stdenv, pkgconfig, autoreconfHook,
{ lib, stdenv, pkg-config, autoreconfHook,
glib, libzip, libserialport, check, libusb1, libftdi,
systemd, alsaLib, dsview
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
export sourceRoot=$sourceRoot/libsigrok4DSL
'';
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
glib libzip libserialport libusb1 libftdi systemd check alsaLib
@@ -1,4 +1,4 @@
{ lib, stdenv, pkgconfig, autoreconfHook,
{ lib, stdenv, pkg-config, autoreconfHook,
glib, check, python3, dsview
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
export sourceRoot=$sourceRoot/libsigrokdecode4DSL
'';
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
python3 glib check
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchgit
, flex, bison, fig2dev, imagemagick, netpbm, gtk2
, pkgconfig
, pkg-config
}:
with lib;
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [
flex
bison
pkgconfig
pkg-config
imagemagick
fig2dev
netpbm
@@ -1,4 +1,4 @@
{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig
{ mkDerivation, lib, stdenv, fetchpatch, fetchFromGitHub, qmake, pkg-config
, qtbase, qtsvg, qttools, qtserialport, boost, libgit2
}:
@@ -32,7 +32,7 @@ mkDerivation rec {
buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
nativeBuildInputs = [ qmake pkgconfig qttools ];
nativeBuildInputs = [ qmake pkg-config qttools ];
patches = [(fetchpatch {
name = "fix-libgit2-version.patch";
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }:
{ lib, stdenv, fetchurl, pkg-config, guile, gtk2, flex, gawk, perl }:
stdenv.mkDerivation {
pname = "geda";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
configureFlags = [
"--disable-update-xdg-database"
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ guile gtk2 flex gawk perl ];
meta = with lib; {
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
{ lib, stdenv, fetchgit, pkg-config, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }:
stdenv.mkDerivation {
pname = "gerbv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ gettext libtool automake autoconf cairo gtk2 ];
configureFlags = ["--disable-update-desktop-database"];
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkgconfig, bzip2, tcl, tk, wrapGAppsHook, judy, xz }:
{ lib, stdenv, fetchurl, glib, gtk3, gperf, pkg-config, bzip2, tcl, tk, wrapGAppsHook, judy, xz }:
stdenv.mkDerivation rec {
pname = "gtkwave";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ma30jyc94iid3v3m8aw4i2lyiqfxkpsdvdmmaibynk400cbzivl";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [ glib gtk3 gperf bzip2 tcl tk judy xz ];
configureFlags = [
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkgconfig, python3Packages
{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages
, boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook
, fmt, graphviz, llvmPackages ? null
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
shopt -u extglob
'';
nativeBuildInputs = [ cmake ninja pkgconfig ];
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = [ qtbase qtsvg boost rapidjson igraph spdlog fmt graphviz wrapQtAppsHook ]
++ (with python3Packages; [ python pybind11 ])
++ lib.optional stdenv.cc.isClang llvmPackages.openmp;
@@ -13,7 +13,7 @@
, libuuid
, libzip
, opencascade
, pkgconfig
, pkg-config
, podofo
, python3
, sqlite
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
boost.dev
pkgconfig
pkg-config
wrapGAppsHook
];
@@ -7,7 +7,7 @@
, groff
, libharu
, autoreconfHook
, pkgconfig
, pkg-config
, libpng
, zlib
}:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkgconfig
pkg-config
];
buildInputs = [
@@ -13,7 +13,7 @@
, curl
, openssl
, boost
, pkgconfig
, pkg-config
, doxygen
, pcre
, libpthreadstubs
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
]
;
nativeBuildInputs = [ cmake doxygen pkgconfig lndir ];
nativeBuildInputs = [ cmake doxygen pkg-config lndir ];
buildInputs = [
libGLU
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, pkgconfig
, pkg-config
, gtk2
, bison
, intltool
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig
pkg-config
bison
intltool
flex
@@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, pkgconfig, cmake, glib, boost, libsigrok
{ mkDerivation, lib, fetchurl, pkg-config, cmake, glib, boost, libsigrok
, libsigrokdecode, libserialport, libzip, udev, libusb1, libftdi1, glibmm
, pcre, librevisa, python3, qtbase, qtsvg
}:
@@ -12,7 +12,7 @@ mkDerivation rec {
sha256 = "0bvgmkgz37n2bi9niskpl05hf7rsj1lj972fbrgnlz25s4ywxrwy";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
glib boost libsigrok libsigrokdecode libserialport libzip udev libusb1 libftdi1 glibmm
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, automake, pkgconfig
{ lib, stdenv, fetchurl, autoreconfHook, automake, pkg-config
, cairo, ghostscript, ngspice, tcl, tk, xorg, zlib }:
let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
sha256 = "1h1ywc3mr7plvwnhdii2zgnnv5ih2nhyl4qbdjpi83dq0aq1s2mn";
};
nativeBuildInputs = [ autoreconfHook automake pkgconfig ];
nativeBuildInputs = [ autoreconfHook automake pkg-config ];
hardeningDisable = [ "format" ];
configureFlags = [
@@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, gtk2, pkgconfig}:
{lib, stdenv, fetchurl, gtk2, pkg-config}:
stdenv.mkDerivation rec {
name = "xoscope-2.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ];
# from: https://aur.archlinux.org/packages.php?ID=12140&detail=1