diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-01-18 22:50:56 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-19 01:16:25 -0800 |
commit | 9bb3fccb5b55326cb3c2c507464a8a28d44d1730 (patch) | |
tree | 9d1c0c16cce5e5dcc08115230f6412865487964b /pkgs/development/guile-modules | |
parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) |
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.
Diffstat (limited to 'pkgs/development/guile-modules')
10 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 31867d16b4cff..15e3ccbb9722a 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -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; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index db16c91c4ef60..3521853187c44 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -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"; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index e1ae323707eb8..2dc07deac5c60 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -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; diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 6b860bd28da56..34299b345eeb2 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -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; diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix index eb10c0f1e5913..8f879249a23ea 100644 --- a/pkgs/development/guile-modules/guile-ncurses/default.nix +++ b/pkgs/development/guile-modules/guile-ncurses/default.nix @@ -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 = '' diff --git a/pkgs/development/guile-modules/guile-opengl/default.nix b/pkgs/development/guile-modules/guile-opengl/default.nix index f05804776533a..effa651b99c80 100644 --- a/pkgs/development/guile-modules/guile-opengl/default.nix +++ b/pkgs/development/guile-modules/guile-opengl/default.nix @@ -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"; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index ac5358bade91f..eaf402a86058f 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -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"; diff --git a/pkgs/development/guile-modules/guile-sdl/default.nix b/pkgs/development/guile-modules/guile-sdl/default.nix index a676f65215d21..8816e7b4ffcb3 100644 --- a/pkgs/development/guile-modules/guile-sdl/default.nix +++ b/pkgs/development/guile-modules/guile-sdl/default.nix @@ -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 ]; diff --git a/pkgs/development/guile-modules/guile-sdl2/default.nix b/pkgs/development/guile-modules/guile-sdl2/default.nix index fe1567272ceac..c3f5fdaefbd2d 100644 --- a/pkgs/development/guile-modules/guile-sdl2/default.nix +++ b/pkgs/development/guile-modules/guile-sdl2/default.nix @@ -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 ]; diff --git a/pkgs/development/guile-modules/guile-xcb/default.nix b/pkgs/development/guile-modules/guile-xcb/default.nix index d0cc719b62573..2de4452442592 100644 --- a/pkgs/development/guile-modules/guile-xcb/default.nix +++ b/pkgs/development/guile-modules/guile-xcb/default.nix @@ -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 = '' |