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 @@
{ stdenv, fetchurl, pkgconfig, pure, portaudio, fftw, libsndfile, libsamplerate }:
{ stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }:
stdenv.mkDerivation rec {
baseName = "audio";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure portaudio fftw libsndfile libsamplerate ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, avahi }:
{ stdenv, fetchurl, pkg-config, pure, avahi }:
stdenv.mkDerivation rec {
baseName = "avahi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure avahi ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure }:
{ stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec {
baseName = "csv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure }:
{ stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec {
baseName = "doc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, fcgi }:
{ stdenv, fetchurl, pkg-config, pure, fcgi }:
stdenv.mkDerivation rec {
baseName = "fastcgi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure fcgi ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, faust, libtool }:
{ stdenv, fetchurl, pkg-config, pure, faust, libtool }:
stdenv.mkDerivation rec {
baseName = "faust";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure faust libtool ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, libffi }:
{ stdenv, fetchurl, pkg-config, pure, libffi }:
stdenv.mkDerivation rec {
baseName = "ffi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure libffi ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,5 +1,5 @@
{ stdenv, fetchurl,
pkgconfig, pure, haskellPackages }:
pkg-config, pure, haskellPackages }:
stdenv.mkDerivation rec {
baseName = "gen";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
hsEnv = haskellPackages.ghcWithPackages (hsPkgs : [hsPkgs.language-c]);
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ hsEnv pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU, libGL, xlibsWrapper }:
{ stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }:
stdenv.mkDerivation rec {
baseName = "gl";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure freeglut libGLU libGL xlibsWrapper ];
makeFlags = [
"libdir=${placeholder ''out''}/lib"
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl,
pkgconfig, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }:
stdenv.mkDerivation rec {
baseName = "glpk";
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
"--with-gmp=yes" ];
});
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure glpkWithExtras ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, gnuplot }:
{ stdenv, fetchurl, pkg-config, pure, gnuplot }:
stdenv.mkDerivation rec {
baseName = "gplot";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure gnuplot ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pure, pkgconfig, gsl }:
{ stdenv, fetchurl, pure, pkg-config, gsl }:
stdenv.mkDerivation rec {
baseName = "gsl";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure gsl ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, pure-ffi, gtk2 }:
{ stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }:
stdenv.mkDerivation rec {
baseName = "gtk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure pure-ffi gtk2 ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, liblo }:
{ stdenv, fetchurl, pkg-config, pure, liblo }:
stdenv.mkDerivation rec {
baseName = "liblo";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure liblo ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, lilv, lv2, serd, sord, sratom }:
{ stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }:
stdenv.mkDerivation rec {
baseName = "lilv";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure lilv lv2 serd sord sratom ];
makeFlags = [ "CFLAGS=-I${lilv}/include/lilv-0" "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, lv2 }:
{ stdenv, fetchurl, pkg-config, pure, lv2 }:
stdenv.mkDerivation rec {
baseName = "lv2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure lv2 ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, portmidi }:
{ stdenv, fetchurl, pkg-config, pure, portmidi }:
stdenv.mkDerivation rec {
baseName = "midi";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure portmidi ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure }:
{ stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec {
baseName = "mpfr";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, octave }:
{ stdenv, fetchurl, pkg-config, pure, octave }:
stdenv.mkDerivation rec {
baseName = "octave";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure octave ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, libiodbc }:
{ stdenv, fetchurl, pkg-config, pure, libiodbc }:
stdenv.mkDerivation rec {
baseName = "odbc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure libiodbc ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, pandoc, gawk, getopt }:
{ stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }:
stdenv.mkDerivation rec {
baseName = "pandoc";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pure ];
propagatedBuildInputs = [ pandoc gawk getopt ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure }:
{ stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec {
baseName = "rational";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, readline }:
{ stdenv, fetchurl, pkg-config, pure, readline }:
stdenv.mkDerivation rec {
baseName = "readline";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure readline ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure }:
{ stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec {
baseName = "sockets";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, sqlite }:
{ stdenv, fetchurl, pkg-config, pure, sqlite }:
stdenv.mkDerivation rec {
baseName = "sql3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure sqlite ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure }:
{ stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec {
baseName = "stldict";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
done
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure }:
{ stdenv, fetchurl, pkg-config, pure }:
stdenv.mkDerivation rec {
baseName = "stllib";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
done
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, tcl, tk, xlibsWrapper }:
{ stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }:
stdenv.mkDerivation rec {
baseName = "tk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure tcl tk xlibsWrapper ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pure, libxml2, libxslt }:
{ stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }:
stdenv.mkDerivation rec {
baseName = "xml";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ pure libxml2 libxslt ];
makeFlags = [ "libdir=$(out)/lib" "prefix=$(out)/" ];
setupHook = ../generic-setup-hook.sh;