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.
2021-01-19 01:16:25 -08:00
parent 200bb8c977
commit 9bb3fccb5b
1653 changed files with 3872 additions and 3872 deletions
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, perl, gperf, bison, groff
-, pkgconfig, libXft, pcre
+, pkg-config, libXft, pcre
 , libtomcrypt, libtommath, lz4 }:

 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
    perl gperf bison groff libXft
    pcre libtomcrypt libtommath lz4
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt
-, docbook_xsl, pkgconfig, luajit
+, docbook_xsl, pkg-config, luajit
 , coreutils, gnused, groff, docutils
 , gzip, bzip2, lzip, xz, zstd
 , python, wrapPython, pygments, markdown
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
    sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2";
  };

-  nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ];
+  nativeBuildInputs = [ pkg-config ] ++ [ python wrapPython ];
  buildInputs = [
    openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit
  ];
@@ -5,7 +5,7 @@
 , libssh
 , cmake
 , perl
-, pkgconfig
+, pkg-config
 , rustPlatform
 , curl
 , libiconv
@@ -30,7 +30,7 @@ buildRustPackage rec {

  nativeBuildInputs = [
    cmake
-    pkgconfig
+    pkg-config
    perl
  ];

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, makeWrapper, openssl, git, libiconv, Security, installShellFiles }:

 rustPlatform.buildRustPackage rec {
  pname = "git-gone";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9";

-  nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ];
+  nativeBuildInputs = [ pkg-config makeWrapper installShellFiles ];

  buildInputs = [ openssl ]
    ++ lib.optionals stdenv.isDarwin [ libiconv Security ];
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }:
+{ lib, stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkg-config, openssl, darwin }:

 with rustPlatform;

@@ -15,7 +15,7 @@ buildRustPackage rec {

  cargoSha256 = "sha256-D1CIITuZSAsKYsK8U0q8HwPsYCyrfkTXZThxufEEkWU=";

-  nativeBuildInputs = [ pkgconfig installShellFiles ];
+  nativeBuildInputs = [ pkg-config installShellFiles ];
  buildInputs = [ openssl ]
  ++ lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.Security
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , rustPlatform
 , Security
-, pkgconfig, openssl
+, pkg-config, openssl
 }:

 rustPlatform.buildRustPackage rec {
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {

  cargoSha256 = "sha256-lvxEYjVMJoAFFRG5iVfGwxUeJObIxfEaWokk69l++nI=";

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;

  meta = with lib; {
@@ -15,7 +15,7 @@
 , sendEmailSupport
 , darwin
 , withLibsecret ? false
-, pkgconfig, glib, libsecret
+, pkg-config, glib, libsecret
 , gzip # needed at runtime by gitweb.cgi
 }:

@@ -73,7 +73,7 @@ stdenv.mkDerivation {
    ++ lib.optionals guiSupport [tcl tk]
    ++ lib.optionals withpcre2 [ pcre2 ]
    ++ lib.optionals stdenv.isDarwin [ darwin.Security ]
-    ++ lib.optionals withLibsecret [ pkgconfig glib libsecret ];
+    ++ lib.optionals withLibsecret [ pkg-config glib libsecret ];

  # required to support pthread_cancel()
  NIX_LDFLAGS = lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
@@ -1,7 +1,7 @@
 { lib, stdenv
 , buildGoPackage
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , libgit2_0_27
 }:

@@ -20,7 +20,7 @@ buildGoPackage rec {

  goDeps = ./deps.nix;

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ libgit2_0_27 ];

  meta = with lib; {
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline
+{ lib, stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkg-config, readline
 , cmake }:
 let
  version = "0.3.2";
@@ -8,7 +8,7 @@ buildGoPackage {
  inherit version;

  buildInputs = [ ncurses readline curl ];
-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];

  goPackagePath = "github.com/rgburke/grv";

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
-, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig
+, readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkg-config
 }:

 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
    sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b";
  };

-  nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ];
+  nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkg-config ];

  autoreconfFlags = "-I tools -v";

@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitLab, fetchFromGitHub, buildGoModule, ruby
-, bundlerEnv, pkgconfig
+, bundlerEnv, pkg-config
 # libgit2 + dependencies
 , libgit2, openssl, zlib, pcre, http-parser }:

@@ -50,7 +50,7 @@ in buildGoModule rec {
  };

  buildFlags = [ "-tags=static,system_libgit2" ];
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ rubyEnv.wrappedRuby libgit openssl zlib pcre http-parser ];
  doCheck = false;

@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
  buildInputs = [ openssl ]
    ++ lib.optionals stdenv.isDarwin [ Security ];

-  # Needed to get openssl-sys to use pkgconfig.
+  # Needed to get openssl-sys to use pkg-config.
  OPENSSL_NO_VENDOR = 1;

  meta = with lib; {
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
+{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre
 , SDL2_image, freetype, glew, libGLU, libGL, boost, glm
 }:

@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "16p7b1x4r0915w883lp374jcdqqja37fnb7m8vnsfnl2n64gi8qr";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
    glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL
    boost glm freetype
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkgconfig, graphviz }:
+{ lib, stdenv, fetchmtn, qt4, qmake4Hook, pkg-config, graphviz }:

 let version = "1.0-mtn-head"; in
 stdenv.mkDerivation {
@@ -19,7 +19,7 @@ stdenv.mkDerivation {

  patches = [ ./parallel-building.patch ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ qt4 qmake4Hook graphviz ];

  qmakeFlags = [ "guitone.pro" ];
@@ -1,10 +1,10 @@
-{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib
+{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib
 , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
 }:
 # We need an old version of Graphviz for format compatibility reasons.
 # This version is vulnerable, but monotone-viz will never feed it bad input.
 let graphviz_2_0 = import ./graphviz-2.0.nix {
-      inherit lib stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw
+      inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw
        yacc libtool fontconfig pango gd libwebp;
    }; in
 let inherit (gnome2) libgnomecanvas; in
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
  version = "1.0.2";
  pname = "monotone-viz";

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ocaml lablgtk libgnomecanvas glib graphviz_2_0 makeWrapper camlp4];
  src = fetchurl {
    url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, xlibsWrapper, libpng, libjpeg, expat, libXaw
+{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw
 , yacc, libtool, fontconfig, pango, gd, libwebp
 }:

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [
    xlibsWrapper libpng libjpeg expat libXaw yacc
    libtool fontconfig pango gd libwebp
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, boost, zlib, botan, libidn
-, lua, pcre, sqlite, perl, pkgconfig, expect
+, lua, pcre, sqlite, perl, pkg-config, expect
 , bzip2, gmp, openssl
 }:

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {

  patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ];

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ boost zlib botan libidn lua pcre sqlite expect
    openssl gmp bzip2 ];