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-18 22:50:56 -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

4
pkgs/development/tools/misc/autogen/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }:
{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
stdenv.mkDerivation rec {
pname = "autogen";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "lib" "out" "man" "info" ];
nativeBuildInputs = [
which pkgconfig perl autoreconfHook/*patches applied*/
which pkg-config perl autoreconfHook/*patches applied*/
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# autogen needs a build autogen when cross-compiling
buildPackages.buildPackages.autogen buildPackages.texinfo

4
pkgs/development/tools/misc/awf/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig
{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config
, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
};
nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
buildInputs = [ gtk2 gtk3 ];

4
pkgs/development/tools/misc/babeltrace/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
{ stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
stdenv.mkDerivation rec {
name = "babeltrace-1.5.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libuuid popt elfutils ];
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/blackmagic/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
, python, pythonPackages
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
gcc-arm-embedded pkgconfig
gcc-arm-embedded pkg-config
];
buildInputs = [

4
pkgs/development/tools/misc/bsdbuild/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
{ stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }:
stdenv.mkDerivation rec {
pname = "bsdbuild";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl mandoc ed ];
nativeBuildInputs = [ pkgconfig libtool gettext ];
nativeBuildInputs = [ pkg-config libtool gettext ];
prePatch = ''
#ignore unfamiliar flags

4
pkgs/development/tools/misc/coccinelle/default.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkg-config }:
stdenv.mkDerivation rec {
pname = "coccinelle";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = with ocamlPackages; [
ocaml findlib menhir
ocaml_pcre pycaml
python ncurses pkgconfig
python ncurses pkg-config
];
doCheck = !stdenv.isDarwin;

4
pkgs/development/tools/misc/d-feet/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv
, pkgconfig
, pkg-config
, fetchurl
, meson
, ninja
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
itstool
meson
ninja
pkgconfig
pkg-config
python3
wrapGAppsHook
];

4
pkgs/development/tools/misc/dfu-util/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, libusb1 }:
{ stdenv, fetchurl, pkg-config, libusb1 }:
stdenv.mkDerivation rec {
pname = "dfu-util";
version = "0.10";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
src = fetchurl {

6
pkgs/development/tools/misc/distcc/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand
{ stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static
, runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc
@@ -17,8 +17,8 @@ let
sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static];
nativeBuildInputs = [ pkg-config ];
buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static];
preConfigure =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)

4
pkgs/development/tools/misc/eggdbus/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }:
{ stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }:
stdenv.mkDerivation rec {
name = "eggdbus-0.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib dbus dbus-glib ];
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/fujprog/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv
, fetchFromGitHub
, cmake
, pkgconfig
, pkg-config
, IOKit
, libftdi1
, libusb-compat-0_1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
pkg-config
];
buildInputs = [

4
pkgs/development/tools/misc/gdb/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, targetPackages
# Build time
, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
# Run time
, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
./darwin-target-match.patch
];
nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ];
nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ];
buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ]
++ stdenv.lib.optional pythonSupport python3

4
pkgs/development/tools/misc/gob2/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }:
{ stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }:
stdenv.mkDerivation rec {
pname = "gob2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
# configure script looks for d-bus but it is only needed for tests
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib bison flex ];
passthru = {

4
pkgs/development/tools/misc/gpshell/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin
{ stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
, makeWrapper
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ globalplatform pcsclite makeWrapper ];
postFixup = ''

4
pkgs/development/tools/misc/gtkdialog/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk2, pkgconfig }:
{stdenv, fetchurl, gtk2, pkg-config }:
stdenv.mkDerivation {
name = "gtkdialog-0.8.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ];
meta = {

4
pkgs/development/tools/misc/gtkperf/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, pkgconfig, libintl }:
{ stdenv, fetchurl, gtk2, pkg-config, libintl }:
stdenv.mkDerivation {
name = "gtkperf-0.40.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 libintl ];
# https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db

4
pkgs/development/tools/misc/hydra-cli/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec {
pname = "hydra-cli";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [
pkgconfig
pkg-config
];
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/hydra/common.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
@@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];

4
pkgs/development/tools/misc/intel-gpu-tools/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
{ stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
, procps, utilmacros, gtk-doc, openssl, peg, elfutils
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0";
};
nativeBuildInputs = [ pkgconfig utilmacros ];
nativeBuildInputs = [ pkg-config utilmacros ];
buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
libXext libXv libXrandr glib bison libunwind python3 procps
gtk-doc openssl peg elfutils ];

4
pkgs/development/tools/misc/kconfig-frontends/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }:
{ stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
stdenv.mkDerivation rec {
basename = "kconfig-frontends";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
configureFlags = [

4
pkgs/development/tools/misc/lttng-tools/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
{ stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
stdenv.mkDerivation rec {
pname = "lttng-tools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/lttv/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
{ stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }:
stdenv.mkDerivation rec {
name = "lttv-1.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk2 popt babeltrace ];
meta = with stdenv.lib; {

4
pkgs/development/tools/misc/msitools/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }:
{ stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
stdenv.mkDerivation rec {
pname = "msitools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
};
nativeBuildInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkg-config ];
buildInputs = [ glib libgsf libuuid gcab bzip2 ];
passthru = {

2
pkgs/development/tools/misc/pkg-config/default.nix
View File

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.29.2";
src = fetchurl {
url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz";
url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz";
sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
};

4
pkgs/development/tools/misc/sccache/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkg-config, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec {
version = "0.2.14";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [
pkgconfig cargo rustc
pkg-config cargo rustc
];
buildInputs = [
openssl

4
pkgs/development/tools/misc/sysbench/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, libmysqlclient, libaio
}:
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
pname = "sysbench";
version = "1.0.20";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libmysqlclient libaio ];
src = fetchFromGitHub {

4
pkgs/development/tools/misc/universal-ctags/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }:
stdenv.mkDerivation {
pname = "universal-ctags";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn";
};
nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ];
buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
# to generate makefile.in

4
pkgs/development/tools/misc/usb-modeswitch/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, makeWrapper
{ stdenv, lib, fetchurl, pkg-config, makeWrapper
, libusb1, tcl, util-linux, coreutils, bash }:
stdenv.mkDerivation rec {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ libusb1 tcl ];
nativeBuildInputs = [ pkgconfig makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
meta = with stdenv.lib; {
description = "A mode switching tool for controlling 'multi-mode' USB devices";