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, telepathy-glib, farstream, dbus-glib }:
|
||||
{ stdenv, fetchurl, pkg-config, telepathy-glib, farstream, dbus-glib }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}-0.6.2";
|
||||
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dbus-glib telepathy-glib farstream ];
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "GObject-based C library that uses Telepathy GLib, Farstream and GStreamer to handle the media streaming part of channels of type Call";
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, dbus-glib, glib, python2, pkgconfig, libxslt
|
||||
{ stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt
|
||||
, gobject-introspection, vala, glibcLocales }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
||||
LC_ALL = "en_US.UTF-8";
|
||||
propagatedBuildInputs = [ dbus-glib glib ];
|
||||
|
||||
nativeBuildInputs = [ pkgconfig libxslt gobject-introspection vala ];
|
||||
nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ];
|
||||
buildInputs = [ glibcLocales python2 ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ stdenv, fetchurl, cmake, qtbase, pkgconfig, python3Packages, dbus-glib, dbus
|
||||
{ stdenv, fetchurl, cmake, qtbase, pkg-config, python3Packages, dbus-glib, dbus
|
||||
, telepathy-farstream, telepathy-glib, fetchpatch }:
|
||||
|
||||
let
|
||||
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
|
||||
sha256 = "bf8e2a09060addb80475a4938105b9b41d9e6837999b7a00e5351783857e18ad";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkgconfig python ];
|
||||
nativeBuildInputs = [ cmake pkg-config python ];
|
||||
propagatedBuildInputs = [ qtbase telepathy-farstream telepathy-glib ];
|
||||
buildInputs = [ dbus-glib ];
|
||||
checkInputs = [ dbus.daemon dbus-python ];
|
||||
|
||||
Reference in New Issue
Block a user