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, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
|
||||
, lua, libGLU, libGL, pkgconfig, perl, autoreconfHook
|
||||
, lua, libGLU, libGL, pkg-config, perl, autoreconfHook
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "1i1lvhbgllsh2z8i6jj4mvrjak4a7r69psvk7syw03s4p7670mfk";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU libGL lua
|
||||
perl autoreconfHook ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, gtk2-x11 , pkgconfig , python3 , gfortran , lesstif
|
||||
{ lib, stdenv, fetchurl, gtk2-x11 , pkg-config , python3 , gfortran , lesstif
|
||||
, cfitsio , getopt , perl , groff , which, darwin, ncurses
|
||||
}:
|
||||
|
||||
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "9faa0b3e674b5ffe5b1aee88027d7401a46ae28cd0b306595300547605d6222a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig groff perl getopt gfortran which ];
|
||||
nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ];
|
||||
|
||||
buildInputs = [ gtk2-x11 lesstif cfitsio python3Env ncurses ]
|
||||
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation ]);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, intltool
|
||||
{ lib, stdenv, fetchurl, pkg-config, intltool
|
||||
, gtk3, glib, curl, goocanvas2, gpsd
|
||||
, hamlib, wrapGAppsHook
|
||||
}:
|
||||
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
|
||||
nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ];
|
||||
buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{lib, stdenv, fetchurl, fetchpatch, pkgconfig, freetype, pango, libpng, libtiff
|
||||
{lib, stdenv, fetchurl, fetchpatch, pkg-config, freetype, pango, libpng, libtiff
|
||||
, giflib, libjpeg, netpbm}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1rzc1alph03j67lrr66499zl0wqndiipmj99nqgvh9xzm1qdb023";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ freetype pango libpng libtiff giflib libjpeg netpbm ];
|
||||
|
||||
patches = [
|
||||
|
||||
Reference in New Issue
Block a user