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:
committed by
Jonathan Ringer
parent
200bb8c977
commit
9bb3fccb5b
@@ -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";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user