public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkgconfig, xmlsec }:
{ lib, stdenv, apacheHttpd, autoconf, automake, autoreconfHook, curl, fetchFromGitHub, glib, lasso, libtool, libxml2, libxslt, openssl, pkg-config, xmlsec }:
stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
./fixdeps.patch
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ apacheHttpd autoconf automake curl glib lasso libtool libxml2 libxslt openssl xmlsec ];
configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs" "--exec-prefix=$out"];
pkgs/servers/http/apache-modules/mod_ca/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, apacheHttpd, openssl, openldap, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, apacheHttpd, openssl, openldap, apr, aprutil }:
stdenv.mkDerivation rec {
pname = "mod_ca";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ apacheHttpd openssl openldap apr aprutil ];
# Note that configureFlags and installFlags are inherited by
pkgs/servers/http/apache-modules/mod_crl/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
pkgs/servers/http/apache-modules/mod_csr/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
pkgs/servers/http/apache-modules/mod_dnssd/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, apacheHttpd, apr, avahi }:
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, apacheHttpd, apr, avahi }:
stdenv.mkDerivation rec {
name = "mod_dnssd-0.6";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-lynx" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ apacheHttpd avahi apr ];
patches = [ (fetchpatch {
pkgs/servers/http/apache-modules/mod_ocsp/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
pname = "mod_ocsp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
pkgs/servers/http/apache-modules/mod_pkcs12/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
pname = "mod_pkcs12";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
pkgs/servers/http/apache-modules/mod_scep/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
pname = "mod_scep";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
pkgs/servers/http/apache-modules/mod_spkac/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
pname = "mod_spkac";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
pkgs/servers/http/apache-modules/mod_timestamp/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, mod_ca, apr, aprutil }:
{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }:
stdenv.mkDerivation rec {
pname = "mod_timestamp";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mod_ca apr aprutil ];
inherit (mod_ca) configureFlags installFlags;
pkgs/servers/http/apt-cacher-ng/default.nix
+2 -2
View File
@@ -7,7 +7,7 @@
, libevent
, lzma
, openssl
, pkgconfig
, pkg-config
, systemd
, tcp_wrappers
, zlib
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2";
};
nativeBuildInputs = [ cmake doxygen pkgconfig ];
nativeBuildInputs = [ cmake doxygen pkg-config ];
buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ];
meta = with lib; {
pkgs/servers/http/couchdb/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_1_8_5, curl, help2man
, sphinx, which, file, pkgconfig, getopt }:
, sphinx, which, file, pkg-config, getopt }:
stdenv.mkDerivation rec {
pname = "couchdb";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1b9cbdrmh1i71mrwvhm17v4cf7lckpil1vvq7lpmxyn6zfk0l84i";
};
nativeBuildInputs = [ help2man which file pkgconfig sphinx ];
nativeBuildInputs = [ help2man which file pkg-config sphinx ];
buildInputs = [ erlang icu openssl spidermonkey_1_8_5 curl ];
postInstall = ''
pkgs/servers/http/h2o/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub
, pkgconfig, cmake, ninja
, pkg-config, cmake, ninja
, openssl, libuv, zlib
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" "dev" "lib" ];
nativeBuildInputs = [ pkgconfig cmake ninja ];
nativeBuildInputs = [ pkg-config cmake ninja ];
buildInputs = [ openssl libuv zlib ];
meta = with lib; {
pkgs/servers/http/lighttpd/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
{ lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file
, openssl, enableMagnet ? false, lua5_1 ? null
, enableMysql ? false, libmysqlclient ? null
, enableLdap ? false, openldap ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
++ lib.optional enableMagnet lua5_1
++ lib.optional enableMysql libmysqlclient
pkgs/servers/http/lwan/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib, cmake, jemalloc }:
{ lib, stdenv, fetchFromGitHub, pkg-config, zlib, cmake, jemalloc }:
stdenv.mkDerivation rec {
pname = "lwan";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1znkcsbxw3r10prqvf2x27w1wmm9kd485pj59c364wlvqdhidwqr";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ jemalloc zlib ];
pkgs/servers/http/pshs/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libevent, file, qrencode, miniupnpc }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libevent, file, qrencode, miniupnpc }:
stdenv.mkDerivation rec {
pname = "pshs";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1j8j4r0vsmp6226q6jdgf9bzhx3qk7vdliwaw7f8kcsrkndkg6p4";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libevent file qrencode miniupnpc ];
# SSL requires libevent at 2.1 with ssl support
pkgs/servers/http/redstore/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2
{ lib, stdenv, fetchurl, redland, pkg-config, gmp, zlib, librdf_raptor2
, librdf_rasqal }:
stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0hc1fjfbfvggl72zqx27v4wy84f5m7bp4dnwd8g41aw8lgynbgaq";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gmp redland zlib librdf_raptor2 librdf_rasqal ];
preConfigure = ''