pkgs/tools: pkgconfig -> pkg-config (2)

2021-01-17 16:17:16 +07:00
parent 979e6e67d3
commit d6aeae8f90
250 changed files with 507 additions and 507 deletions
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
@@ -1,5 +1,5 @@
 { lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, gyp, which, ninja,
-  python, pkgconfig, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese,
+  python, pkg-config, protobuf, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese,
  fcitx, gettext }:
 let
  japanese_usage_dictionary = fetchFromGitHub {
@@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec {
    sha256 = "0w2dy2j9x5nc7x3g95j17r3m60vbfyn5j617h7js9xryv33yzpgx";
  };

-  nativeBuildInputs = [ gyp which ninja python pkgconfig qt5.wrapQtAppsHook ];
+  nativeBuildInputs = [ gyp which ninja python pkg-config qt5.wrapQtAppsHook ];
  buildInputs = [ protobuf gtk2 zinnia qt5.qtbase libxcb fcitx gettext ];

  postUnpack = ''
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-skk/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, fcitx, libskk, skk-dicts }:
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, fcitx, libskk, skk-dicts }:

 stdenv.mkDerivation {
  pname = "fcitx-skk";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
    sha256 = "1yl2syqrk212h26vzzkwl19fyp71inqmsli9411h4n2hbcp6m916";
  };

-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ fcitx libskk skk-dicts ];

  cmakeFlags = [ "-DSKK_DEFAULT_PATH=${skk-dicts}/share/SKK-JISYO.combined"
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -2,7 +2,7 @@
 , cmake
 , extra-cmake-modules
 , fcitx
-, pkgconfig
+, pkg-config
 , qtbase
 }:

@@ -17,7 +17,7 @@ mkDerivation rec {
    sha256 = "0860v3rxsh054wkkbawvyin5mk0flp4cwfcpmcpq147lvdm5lq2i";
  };

-  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
+  nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];

  buildInputs = [ fcitx qtbase ];

--- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix
+++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
+{ lib, stdenv, fetchurl, pkg-config, cmake, intltool, gettext
 , libxml2, enchant2, isocodes, icu, libpthreadstubs
 , pango, cairo, libxkbfile, libXau, libXdmcp, libxkbcommon
 , dbus, gtk2, gtk3, qt4, extra-cmake-modules
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
    patchShebangs cmake/
  '';

-  nativeBuildInputs = [ cmake extra-cmake-modules intltool pkgconfig pcre ];
+  nativeBuildInputs = [ cmake extra-cmake-modules intltool pkg-config pcre ];

  buildInputs = [
    xkeyboard_config enchant2 gettext isocodes icu libpthreadstubs libXau libXdmcp libxkbfile
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl
 , fetchFromGitHub
-, pkgconfig
+, pkg-config
 , cmake
 , extra-cmake-modules
 , gettext
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    cmake
    extra-cmake-modules
-    pkgconfig
+    pkg-config
    gettext
  ];

--- a/pkgs/tools/inputmethods/gebaar-libinput/default.nix
+++ b/pkgs/tools/inputmethods/gebaar-libinput/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, libinput, zlib }:
+{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libinput, zlib }:

 stdenv.mkDerivation rec {
  pname = "gebaar-libinput";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

-  nativeBuildInputs = [ pkgconfig cmake ];
+  nativeBuildInputs = [ pkg-config cmake ];
  buildInputs = [ libinput zlib ];

  meta = with lib; {
--- a/pkgs/tools/inputmethods/hime/default.nix
+++ b/pkgs/tools/inputmethods/hime/default.nix
@@ -1,5 +1,5 @@
 {
-stdenv, fetchFromGitHub, pkgconfig, which, gtk2, gtk3, qt4, qt5, libXtst, lib,
+stdenv, fetchFromGitHub, pkg-config, which, gtk2, gtk3, qt4, qt5, libXtst, lib,
 }:

 # chewing and anthy do not work well
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
    sha256 = "024w67q0clzxigsrvqbxpiy8firjvrqi7wbkkcapzzhzapv3nm8x";
  };

-  nativeBuildInputs = [ which pkgconfig ];
+  nativeBuildInputs = [ which pkg-config ];
  buildInputs = [ libXtst gtk2 gtk3 qt4 qt5.qtbase ];

  preConfigure = "patchShebangs configure";
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchurl
 , gettext
-, pkgconfig
+, pkg-config
 , wrapGAppsHook
 , anthy
 , ibus
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    gettext
    gobject-introspection
-    pkgconfig
+    pkg-config
    wrapGAppsHook
  ];

--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , gettext
 , xorg
-, pkgconfig
+, pkg-config
 , wrapGAppsHook
 , ibus
 , gtk3
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [
    gettext
-    pkgconfig
+    pkg-config
    wrapGAppsHook
    go
  ];
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -3,7 +3,7 @@
 , substituteAll
 , appstream-glib
 , gettext
-, pkgconfig
+, pkg-config
 , wrapGAppsHook
 , gtk3
 , ibus
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    appstream-glib
    gettext
-    pkgconfig
+    pkg-config
    wrapGAppsHook
  ];

--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl
-, vala, intltool, pkgconfig
+, vala, intltool, pkg-config
 , libkkc, ibus, skk-dicts
 , gtk3
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [
-    vala intltool pkgconfig
+    vala intltool pkg-config
  ];

  buildInputs = [ libkkc ibus skk-dicts gtk3 ];
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , autoreconfHook
 , gettext
-, pkgconfig
+, pkg-config
 , wrapGAppsHook
 , sqlite
 , libpinyin
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    autoreconfHook
    gettext
-    pkgconfig
+    pkg-config
    wrapGAppsHook
  ];

--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
 , autoreconfHook
-, pkgconfig
+, pkg-config
 , ibus
 , gtk3
 , m17n_lib
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    autoreconfHook
    gettext
-    pkgconfig
+    pkg-config
    wrapGAppsHook
  ];

--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkgconfig, protobuf
+{ lib, stdenv, fetchFromGitHub, which, ninja, python, pkg-config, protobuf
 , ibus, gtk2, zinnia, qt5, libxcb, tegaki-zinnia-japanese, python3Packages }:

 let
@@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [ which ninja python3Packages.python python3Packages.six
-                        python3Packages.gyp pkgconfig qt5.wrapQtAppsHook ];
+                        python3Packages.gyp pkg-config qt5.wrapQtAppsHook ];
  buildInputs = [ protobuf ibus gtk2 zinnia qt5.qtbase libxcb ];

  src = fetchFromGitHub {
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, ibus, ibus-table, pkgconfig, python3 }:
+{ lib, stdenv, fetchurl, ibus, ibus-table, pkg-config, python3 }:

 stdenv.mkDerivation rec {
  pname = "ibus-table-others";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "0763wnlklcs3d8fk21nkp7dgn4qzqgxh1s24q3kl8gzgng2a88jj";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ ibus ibus-table python3 ];

  preBuild = ''
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub
-, autoreconfHook, docbook2x, pkgconfig
+, autoreconfHook, docbook2x, pkg-config
 , gtk3, dconf, gobject-introspection
 , ibus, python3, wrapGAppsHook }:

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    autoreconfHook
    docbook2x
-    pkgconfig
+    pkg-config
    gobject-introspection
    wrapGAppsHook
  ];
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkgconfig, gtk3, m17n_lib
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, python3, ibus, pkg-config, gtk3, m17n_lib
 , wrapGAppsHook, gobject-introspection
 }:

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {

  patches = [ ./hunspell-dirs.patch ];

-  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook gobject-introspection ];
+  nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ];
  buildInputs = [ python ibus gtk3 m17n_lib ];

  preFixup = ''
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -5,7 +5,7 @@
 , autoreconfHook
 , gettext
 , makeWrapper
-, pkgconfig
+, pkg-config
 , vala
 , wrapGAppsHook
 , dbus
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
    gtk-doc
    gettext
    makeWrapper
-    pkgconfig
+    pkg-config
    python3BuildEnv
    vala
    wrapGAppsHook
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, cmake, libyamlcpp,
+{ lib, stdenv, fetchurl, pkg-config, cmake, libyamlcpp,
  libevdev, udev }:

 let
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
    sha256 = "0lqz89wsf9r5xdgflincysxg4l8fpgg5z8zczhhrg9s5787srfzi";
  };

-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
  buildInputs = [ libevdev udev libyamlcpp ];

  prePatch = ''
--- a/pkgs/tools/inputmethods/libkkc/default.nix
+++ b/pkgs/tools/inputmethods/libkkc/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl
 , vala, gobject-introspection, intltool, python2Packages, glib
-, pkgconfig
+, pkg-config
 , libgee, json-glib, marisa, libkkc-data
 }:

@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [
    vala gobject-introspection
    python2Packages.python python2Packages.marisa
-    intltool glib pkgconfig
+    intltool glib pkg-config
  ];

  buildInputs = [ marisa libkkc-data ];
--- a/pkgs/tools/inputmethods/nabi/default.nix
+++ b/pkgs/tools/inputmethods/nabi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, gtk2, libhangul }:
+{ lib, stdenv, fetchurl, pkg-config, gtk2, libhangul }:

 stdenv.mkDerivation {
  name = "nabi-1.0.0";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
    sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw";
  };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ gtk2 libhangul ];

  meta = with lib; {
--- a/pkgs/tools/inputmethods/skk/skktools/default.nix
+++ b/pkgs/tools/inputmethods/skk/skktools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, gdbm, glib }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, gdbm, glib }:

 # Note (2017-10-24, yuriaisaka):
 # - Version 1.3.3 dates from Jul. 19, 2013.
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
  #   sha256 = "1k9zxqybl1l5h0a8px2awc920qrdyp1qls50h3kfrj3g65d08aq2";
  # };

-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ gdbm glib ];

  meta = {
--- a/pkgs/tools/inputmethods/triggerhappy/default.nix
+++ b/pkgs/tools/inputmethods/triggerhappy/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, perl, systemd }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, perl, systemd }:

 stdenv.mkDerivation rec {
  pname = "triggerhappy";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "0gb1qhrxwq7i5abd408d01a2dpf28nr1fph1fg7w7n0i5i1nnk90";
  };

-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkg-config perl ];
  buildInputs = [ systemd ];

  makeFlags = [ "PREFIX=$(out)" "BINDIR=$(out)/bin" ];
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, shared-mime-info
-, autoconf, automake, intltool, libtool, pkgconfig, cmake
+, autoconf, automake, intltool, libtool, pkg-config, cmake
 , ruby, librsvg
 , ncurses, m17n_lib, m17n_db, expat
 , withAnthy ? true, anthy ? null
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
  };

  nativeBuildInputs = [
-    autoconf automake intltool libtool pkgconfig cmake
+    autoconf automake intltool libtool pkg-config cmake

    ruby # used by sigscheme build to generate function tables
    librsvg # used by uim build to generate png pixmaps from svg