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 @@
|
||||
{ stdenv, fetchurl, pkgconfig, libsndfile }:
|
||||
{ stdenv, fetchurl, pkg-config, libsndfile }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libbs2b";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0vz442kkjn2h0dlxppzi4m5zx8qfyrivq581n06xzvnyxi5rg6a7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libsndfile ];
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, autoreconfHook, glib, pkgconfig }:
|
||||
{ stdenv, fetchurl, autoreconfHook, glib, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "1.3";
|
||||
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1527pcc1vd0l5iks2yw8m0bymcrnih2md5465lwpzw0wgy4rky7n";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkgconfig ];
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ glib ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, sratom, wafHook }:
|
||||
{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, sratom, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lilv";
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
patches = [ ./lilv-pkgconfig.patch ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python3 wafHook ];
|
||||
nativeBuildInputs = [ pkg-config python3 wafHook ];
|
||||
buildInputs = [ serd sord sratom ];
|
||||
propagatedBuildInputs = [ lv2 ];
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python3, wafHook }:
|
||||
{ stdenv, fetchurl, gtk2, libsndfile, pkg-config, python3, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lv2";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0gs7401xz23q9vajqr31aa2db8dvssgyh5zrvr4ipa6wig7yb8wh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
nativeBuildInputs = [ pkg-config wafHook ];
|
||||
buildInputs = [ gtk2 libsndfile python3 ];
|
||||
|
||||
wafConfigureFlags = stdenv.lib.optionals stdenv.isDarwin [ "--lv2dir=${placeholder "out"}/lib/lv2" ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python, wafHook }:
|
||||
{ stdenv, fetchurl, boost, gtkmm2, lv2, pkg-config, python, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "lvtk";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "03nbj2cqcklqwh50zj2gwm07crh5iwqbpxbpzwbg5hvgl4k4rnjd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig python wafHook ];
|
||||
nativeBuildInputs = [ pkg-config python wafHook ];
|
||||
buildInputs = [ boost gtkmm2 lv2 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkgconfig, python2, wafHook }:
|
||||
{ stdenv, fetchFromGitHub, cairo, libjpeg, libXft, pkg-config, python2, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ntk";
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0j38mhnfqy6swcrnc5zxcwlqi8b1pgklyghxk6qs1lf4japv2zc0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
nativeBuildInputs = [ pkg-config wafHook ];
|
||||
buildInputs = [
|
||||
cairo libjpeg libXft python2
|
||||
];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchgit, boost, gtk2, pkgconfig, python, wafHook }:
|
||||
{ stdenv, fetchgit, boost, gtk2, pkg-config, python, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "raul";
|
||||
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1z37jb6ghc13b8nv8a8hcg669gl8vh4ni9djvfgga9vcz8rmcg8l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
nativeBuildInputs = [ pkg-config wafHook ];
|
||||
buildInputs = [ boost gtk2 python ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkgconfig }:
|
||||
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2, alsaLib, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "4.0.0";
|
||||
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ autoconf automake libtool libjack2 alsaLib ];
|
||||
|
||||
preConfigure = ''
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, lv2, pkgconfig, python3, serd, sord, wafHook }:
|
||||
{ stdenv, fetchurl, lv2, pkg-config, python3, serd, sord, wafHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sratom";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0vh0biy3ngpzzgdml309c2mqz8xq9q0hlblczb4c6alhp0a8yv0l";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wafHook python3 ];
|
||||
nativeBuildInputs = [ pkg-config wafHook python3 ];
|
||||
buildInputs = [ lv2 serd sord ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom
|
||||
{ stdenv, lib, fetchurl, gtk2, lv2, pkg-config, python, serd, sord, sratom
|
||||
, wafHook
|
||||
, withQt4 ? true, qt4 ? null
|
||||
, withQt5 ? false, qt5 ? null }:
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0z4v01pjw4wh65x38w6icn28wdwxz13ayl8hvn4p1g9kmamp1z06";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig wafHook ];
|
||||
nativeBuildInputs = [ pkg-config wafHook ];
|
||||
buildInputs = [ gtk2 lv2 python serd sord sratom ]
|
||||
++ (lib.optionals withQt4 [ qt4 ])
|
||||
++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ]));
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# set VAMP_PATH ?
|
||||
# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
|
||||
|
||||
{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
|
||||
{ stdenv, fetchFromGitHub, pkg-config, libsndfile }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vamp-plugin-sdk";
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1lhmskcyk7qqfikmasiw7wjry74gc8g5q6a3j1iya84yd7ll0cz6";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ libsndfile ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
Reference in New Issue
Block a user