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,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, guile, guile-lib, cairo, expat }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, guile, guile-lib, cairo, expat }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "guile-cairo";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0yx0844p61ljd4d3d63qrawiygiw6ks02fwv2cqx7nav5kfd8ck2";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ guile cairo expat ];
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, guile, texinfo }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, guile, texinfo }:
|
||||
|
||||
let
|
||||
version = "1.0.0";
|
||||
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "1r47m1m112kxf23xny99f0qkqsk6626iyc5jp7vzndfiyp5yskwi";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ guile texinfo ];
|
||||
|
||||
autoreconfPhase = "./autogen.sh";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ fetchurl, lib, stdenv, guile, guile-lib, gwrap
|
||||
, pkgconfig, gconf, glib, gnome_vfs, gtk2
|
||||
, pkg-config, gconf, glib, gnome_vfs, gtk2
|
||||
, libglade, libgnome, libgnomecanvas, libgnomeui
|
||||
, pango, guile-cairo, texinfo
|
||||
}:
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
texinfo guile gwrap pkgconfig gconf glib gnome_vfs gtk2
|
||||
texinfo guile gwrap pkg-config gconf glib gnome_vfs gtk2
|
||||
libglade libgnome libgnomecanvas libgnomeui pango guile-cairo
|
||||
] ++ lib.optional doCheck guile-lib;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, guile, texinfo, pkgconfig }:
|
||||
{ lib, stdenv, fetchurl, guile, texinfo, pkg-config }:
|
||||
|
||||
assert stdenv ? cc && stdenv.cc.isGNU;
|
||||
|
||||
@@ -13,7 +13,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ guile texinfo ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, guile, ncurses, libffi }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, guile, ncurses, libffi }:
|
||||
|
||||
let
|
||||
name = "guile-ncurses-${version}";
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "153vv75gb7l62sp3666rc97i63rnaqbx2rjar7d9b5w81fhwv4r5";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ guile ncurses libffi ];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, guile }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, guile }:
|
||||
|
||||
let
|
||||
name = "guile-opengl-${version}";
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig guile ];
|
||||
nativeBuildInputs = [ pkg-config guile ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Guile bindings for the OpenGL graphics API";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkgconfig
|
||||
{ lib, stdenv, fetchurl, fetchpatch, pkg-config
|
||||
, gperf, guile, guile-lib, libffi }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "sha256-OMK0ROrbuMDKt42QpE7D6/9CvUEMW4SpEBjO5+tk0rs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ gperf guile guile-lib libffi ];
|
||||
|
||||
GUILE_SITE="${guile-lib}/share/guile/site";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, guile, buildEnv
|
||||
{ lib, stdenv, fetchurl, pkg-config, guile, buildEnv
|
||||
, SDL, SDL_image, SDL_ttf, SDL_mixer
|
||||
}:
|
||||
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0cjgs012a9922hn6xqwj66w6qmfs3nycnm56hyykx5n3g5p7ag01";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig guile ];
|
||||
nativeBuildInputs = [ pkg-config guile ];
|
||||
|
||||
buildInputs = [ SDL.dev SDL_image SDL_ttf SDL_mixer ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, guile, libtool, pkgconfig
|
||||
{ lib, stdenv, fetchurl, guile, libtool, pkg-config
|
||||
, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer
|
||||
}:
|
||||
|
||||
@@ -14,7 +14,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "118x0cg7fzbsyrfhy5f9ab7dqp9czgia0ycgzp6sn3nlsdrcnr4m";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ libtool pkgconfig ];
|
||||
nativeBuildInputs = [ libtool pkg-config ];
|
||||
buildInputs = [
|
||||
guile SDL2 SDL2_image SDL2_ttf SDL2_mixer
|
||||
];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, guile, texinfo }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, guile, texinfo }:
|
||||
|
||||
let
|
||||
name = "guile-xcb-${version}";
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
|
||||
sha256 = "04dvbqdrrs67490gn4gkq9zk8mqy3mkls2818ha4p0ckhh0pm149";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ guile texinfo ];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
Reference in New Issue
Block a user