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
@@ -3,7 +3,7 @@
|
||||
, automake
|
||||
, libtool
|
||||
, intltool
|
||||
, pkgconfig
|
||||
, pkg-config
|
||||
, jansson
|
||||
# deadbeef can use either gtk2 or gtk3
|
||||
, gtk2Support ? false, gtk2 ? null
|
||||
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
|
||||
automake
|
||||
intltool
|
||||
libtool
|
||||
pkgconfig
|
||||
pkg-config
|
||||
] ++ lib.optional gtk3Support wrapGAppsHook;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, libxml2, deadbeef, glib, gtk3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, libxml2, deadbeef, glib, gtk3 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deadbeef-headerbar-gtk3-plugin";
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "1v1schvnps7ypjqgcbqi74a45w8r2gbhrawz7filym22h1qr9wn0";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkgconfig libxml2 ];
|
||||
nativeBuildInputs = [ autoconf automake libtool pkg-config libxml2 ];
|
||||
buildInputs = [ deadbeef glib gtk3 ];
|
||||
|
||||
# Choose correct installation path
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, deadbeef, gtk3, libxml2 }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, deadbeef, gtk3, libxml2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deadbeef-infobar-plugin";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0c9wh3wh1hdww7v96i8cy797la06mylhfi0880k8vwh88079aapf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ deadbeef gtk3 libxml2 ];
|
||||
|
||||
buildFlags = [ "gtk3" ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, pkgconfig, deadbeef, gtkmm3, libxmlxx3 }:
|
||||
{ lib, stdenv, fetchFromGitHub, pkg-config, deadbeef, gtkmm3, libxmlxx3 }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "deadbeef-lyricbar-plugin";
|
||||
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
|
||||
sha256 = "108hx5530f4xm8p9m2bk79nq7jkhcj39ad3vmxb2y6h6l2zv5kwl";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ deadbeef gtkmm3 libxmlxx3 ];
|
||||
|
||||
buildFlags = [ "gtk3" ];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkgconfig, deadbeef, glib }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, deadbeef, glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "deadbeef-mpris2-plugin";
|
||||
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "0s3y4ka4qf38cypc0xspy79q0g5y1kqx6ldad7yr6a45nw6j95jh";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ deadbeef glib ];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user