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/libraries/telepathy | |
parent | 200bb8c977d81ebdf847d5e6839cd46cd3eb8d4d (diff) | |
download | nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.gz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.bz2 nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.lz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.xz nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.tar.zst nixpkgs-9bb3fccb5b55326cb3c2c507464a8a28d44d1730.zip |
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/libraries/telepathy')
-rw-r--r-- | pkgs/development/libraries/telepathy/farstream/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/telepathy/glib/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/telepathy/qt/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 455c761f6ee..a30d8d01c49 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -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"; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index ee2f34776d6..ec9dfab120f 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -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; diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix index ff8ff83fb9a..888d98b957f 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -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 ]; |