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/development/ocaml-modules/cairo2/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, buildDunePackage, ocaml
, pkgconfig, cairo
, pkg-config, cairo
}:
buildDunePackage rec {
@@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "1ik4qf4b9443sliq2z7x9acd40rmzvyzjh3bh98wvjklxbb84a9i";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cairo ];
doCheck = !(stdenv.isDarwin
pkgs/development/ocaml-modules/ctypes/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkgconfig, ncurses, integers }:
{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers }:
if !lib.versionAtLeast ocaml.version "4.02"
then throw "ctypes is not available for OCaml ${ocaml.version}"
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib ncurses ];
propagatedBuildInputs = [ integers libffi ];
pkgs/development/ocaml-modules/fontconfig/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, fontconfig, ocaml }:
{ stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }:
stdenv.mkDerivation {
name = "ocaml-fontconfig-20131103";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml fontconfig ];
makeFlags = [
"OCAML_STDLIB_DIR=$(out)/lib/ocaml/${lib.getVersion ocaml}/site-lib/"
pkgs/development/ocaml-modules/gmetadom/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}:
{stdenv, lib, fetchurl, ocaml, findlib, gdome2, libxslt, pkg-config}:
let
pname = "gmetadom";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ocaml findlib gdome2 libxslt];
propagatedBuildInputs = [gdome2];
pkgs/development/ocaml-modules/lablgtk/2.14.0.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
{ stdenv, lib, fetchurl, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }:
if lib.versionAtLeast ocaml.version "4.04"
then throw "lablgtk-2.14 is not available for OCaml ${ocaml.version}" else
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview camlp4 ];
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
pkgs/development/ocaml-modules/lablgtk/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }:
{ lib, stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkg-config, gtk2, libgnomecanvas, libglade, gtksourceview }:
let param =
let check = lib.versionAtLeast ocaml.version; in
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
pname = "lablgtk";
inherit (param) version src;
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ];
configureFlags = [ "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib" ];
pkgs/development/ocaml-modules/lablgtk3/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, pkgconfig, buildDunePackage, gtk3, cairo2 }:
{ lib, fetchurl, pkg-config, buildDunePackage, gtk3, cairo2 }:
buildDunePackage rec {
version = "3.1.1";
@@ -11,7 +11,7 @@ buildDunePackage rec {
sha256 = "1ygc1yh99gh44h958yffw1vxdlfpn799d4x1s36c2jfbi8f0dir2";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
propagatedBuildInputs = [ gtk3 cairo2 ];
meta = {
pkgs/development/ocaml-modules/lwt/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchzip, pkgconfig, ncurses, libev, buildDunePackage, ocaml
{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml
, cppo, ocaml-migrate-parsetree, ocplib-endian, result
, mmap, seq
}:
@@ -14,7 +14,7 @@ buildDunePackage rec {
sha256 = "15hgy3220m2b8imipa514n7l65m1h5lc6l1hanqwwvs7ghh2aqp2";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ cppo ocaml-migrate-parsetree ]
++ optional (!versionAtLeast ocaml.version "4.07") ncurses;
propagatedBuildInputs = [ libev mmap ocplib-endian seq result ];
pkgs/development/ocaml-modules/magick/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, which, pkgconfig, ocaml, findlib, imagemagick }:
{ stdenv, lib, fetchurl, which, pkg-config, ocaml, findlib, imagemagick }:
if lib.versionAtLeast ocaml.version "4.06"
then throw "magick is not available for OCaml ${ocaml.version}"
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q";
};
nativeBuildInputs = [ which pkgconfig ];
nativeBuildInputs = [ which pkg-config ];
buildInputs = [ ocaml findlib imagemagick ];
createFindlibDestdir = true;
pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
{stdenv, lib, fetchurl, automake, ocaml, autoconf, gnum4, pkg-config, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
let
pname = "ocaml-cairo";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
patches = [ ./META.patch ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml automake gnum4 autoconf unzip
findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
pkgs/development/ocaml-modules/ocamlnet/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
{ stdenv, lib, fetchurl, pkg-config, ncurses, ocaml, findlib, ocaml_pcre, camlzip
, gnutls, nettle
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "1x703mjqsv9nvffnkj5i36ij2s5zfvxxll2z1qj6a7p428b2yfnm";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ];
createFindlibDestdir = true;
pkgs/development/ocaml-modules/ocamlsdl/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{stdenv, lib, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
{stdenv, lib, fetchurl, ocaml, pkg-config, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }:
let
pname = "ocamlsdl";
@@ -17,10 +17,10 @@ stdenv.mkDerivation rec {
sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ocaml findlib SDL SDL_image SDL_mixer SDL_ttf SDL_gfx lablgl];
propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkgconfig ];
propagatedBuildInputs = [ SDL SDL_image SDL_mixer SDL_ttf SDL_gfx pkg-config ];
createFindlibDestdir = true;
meta = {
pkgs/development/ocaml-modules/ocurl/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses, lwt }:
{ stdenv, lib, pkg-config, ocaml, findlib, fetchurl, curl, ncurses, lwt }:
if lib.versionOlder ocaml.version "4.02"
then throw "ocurl is not available for OCaml ${ocaml.version}"
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6";
};
buildInputs = [ pkgconfig ocaml findlib ncurses ];
buildInputs = [ pkg-config ocaml findlib ncurses ];
propagatedBuildInputs = [ curl lwt ];
createFindlibDestdir = true;
meta = {
pkgs/development/ocaml-modules/sqlite3/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, fetchurl, sqlite, pkgconfig, buildDunePackage }:
{ lib, fetchurl, sqlite, pkg-config, buildDunePackage }:
buildDunePackage rec {
pname = "sqlite3";
@@ -10,7 +10,7 @@ buildDunePackage rec {
sha256 = "0sba74n0jvzxibrclhbpqscil36yfw7i9jj9q562yhza6rax9p82";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ sqlite ];
meta = with lib; {
pkgs/development/ocaml-modules/tsdl/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }:
{ lib, stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkg-config, ocb-stubblr }:
if !lib.versionAtLeast ocaml.version "4.03"
then throw "tsdl is not available for OCaml ${ocaml.version}"
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib ocamlbuild topkg ];
propagatedBuildInputs = [ SDL2 ctypes ];
pkgs/development/ocaml-modules/zarith/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl
, ocaml, findlib, pkgconfig, perl
, ocaml, findlib, pkg-config, perl
, gmp
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
inherit (source) version;
src = fetchurl { inherit (source) url sha256; };
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ocaml findlib perl ];
propagatedBuildInputs = [ gmp ];