diff options
author | Ben Siraphob <bensiraphob@gmail.com> | 2021-01-17 10:51:22 +0700 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-01-16 23:49:59 -0800 |
commit | 76f93cc7313a1c32f7d76cf07c154e7bcafe251c (patch) | |
tree | 5582d94717ada25917f084cdd550ec900e90e82c /pkgs/tools/misc | |
parent | fce00d15c2521710ac1043d6b5251803fb9a8808 (diff) | |
download | nixpkgs-76f93cc7313a1c32f7d76cf07c154e7bcafe251c.tar nixpkgs-76f93cc7313a1c32f7d76cf07c154e7bcafe251c.tar.gz nixpkgs-76f93cc7313a1c32f7d76cf07c154e7bcafe251c.tar.bz2 nixpkgs-76f93cc7313a1c32f7d76cf07c154e7bcafe251c.tar.lz nixpkgs-76f93cc7313a1c32f7d76cf07c154e7bcafe251c.tar.xz nixpkgs-76f93cc7313a1c32f7d76cf07c154e7bcafe251c.tar.zst nixpkgs-76f93cc7313a1c32f7d76cf07c154e7bcafe251c.zip |
pkgs/tools: pkgconfig -> pkg-config
Diffstat (limited to 'pkgs/tools/misc')
97 files changed, 193 insertions, 193 deletions
diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 6ad9341b85e..5585b6901dc 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig +, pkg-config , autoconf , automake111x , libtool @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool automake111x autoconf diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicroX/default.nix index cb5496d450c..452906a1cf8 100644 --- a/pkgs/tools/misc/antimicroX/default.nix +++ b/pkgs/tools/misc/antimicroX/default.nix @@ -2,7 +2,7 @@ , lib , cmake , extra-cmake-modules -, pkgconfig +, pkg-config , SDL2 , qtbase , qttools @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "05asxlkgb4cgvpcyksw1cx8cz8nzi8hmw8b91lw92892j7a2r7wj"; }; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config itstool ]; buildInputs = [ SDL2 qtbase diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index cdce76a324c..609899bbe30 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, xmlbird, +{ lib, stdenv, fetchurl, pkg-config, python3, xmlbird, cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala_0_44, gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0620bppcbm9pb8l0d4sc56gfwkr97gw4zjirjz5ikk5lj0m801yi"; }; - nativeBuildInputs = [ python3 pkgconfig vala_0_44 gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ python3 pkg-config vala_0_44 gobject-introspection wrapGAppsHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index 3f103024d89..cacebb93995 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, pkgconfig, vala, glib, gobject-introspection }: +{ lib, stdenv, fetchurl, python3, pkg-config, vala, glib, gobject-introspection }: stdenv.mkDerivation rec { pname = "xmlbird"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "15z4rvii3p54g2hasibjnf83c1702d84367fnl8pbisjqqrdcl04"; }; - nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection ]; + nativeBuildInputs = [ python3 pkg-config vala gobject-introspection ]; buildInputs = [ glib ]; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 76fadcb7c15..23096bb2eaf 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libusb1, pkgconfig, ... }: +{ lib, stdenv, fetchurl, libusb1, pkg-config, ... }: stdenv.mkDerivation rec { pname = "blink1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1waci6hccv5i50v5d3z7lx4h224fbkj66ywfynnsgn46w0jm6imv"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; configurePhase = '' diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index af7e3a3d642..ca5f99f3b62 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ncurses, libconfuse +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ncurses, libconfuse , libnl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1ilba872c09mnlvylslv4hqv6c9cz36l76q74rr99jvis1dg69gf"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ncurses libconfuse libnl ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index 244e945bb20..b71740c325a 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, python3, bluez +{ lib, stdenv, fetchurl, pkg-config, python3, bluez , alsaSupport ? stdenv.isLinux, alsaLib ? null , systemdSupport ? stdenv.isLinux, systemd ? null }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; }; - nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; + nativeBuildInputs = [ pkg-config python3.pkgs.cython ]; buildInputs = [ bluez ] ++ lib.optional alsaSupport alsaLib ++ lib.optional systemdSupport systemd; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 262fd853d10..f196bb5af03 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, which, libxslt, libxml2, docbook_xml_dtd_412, docbook_xsl, glib, imagemagick, darwin }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool - pkgconfig + pkg-config which libxslt libxml2 diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index fefb797dbd0..6c13c3bbe6a 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, substituteAll, udev -, pkgconfig, qtbase, cmake, zlib, kmod }: +, pkg-config, qtbase, cmake, zlib, kmod }: mkDerivation rec { version = "0.4.2"; @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/tools/misc/colord-gtk/default.nix b/pkgs/tools/misc/colord-gtk/default.nix index 403b3df0753..d77204836b2 100644 --- a/pkgs/tools/misc/colord-gtk/default.nix +++ b/pkgs/tools/misc/colord-gtk/default.nix @@ -12,7 +12,7 @@ , libxslt , glib , gtk3 -, pkgconfig +, pkg-config , lcms2 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext meson ninja diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 8a8d110f4e9..89435332c9c 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -4,7 +4,7 @@ , bash-completion , glib , polkit -, pkgconfig +, pkg-config , gettext , gusb , lcms2 @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config shared-mime-info vala wrapGAppsHook diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index c311de3a779..5960ba5c573 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, glib, procps, libxml2 }: +{ stdenv, lib, fetchFromGitHub, pkg-config, glib, procps, libxml2 }: stdenv.mkDerivation { pname = "dbus-map"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { rev = "43703fc5e15743309b67131b5ba457b0d6ea7667"; sha256 = "1pjqn6w29ci8hfxkn1aynzfc8nvy3pqv3hixbxwr7qx20g4rwvdc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib procps libxml2 ]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 4e3733533a8..604ba0cbf75 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, libxml2 -, pciutils, pkgconfig, gtk2, ddccontrol-db +, pciutils, pkg-config, gtk2, ddccontrol-db , makeDesktopItem }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "09npy6z2j3jrvpvlr46vih31y2mbrh7wsqlbrjprxjv1j0kkz5q2"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ libxml2 diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index 4a3e8aa9e34..4f519d6858d 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1ppiddnrvkbb9iir28kl9hzpww0hpgb05jfxzf07xsqkdfb4qv71"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ i2c-tools udev libgudev glib libusb1 libdrm xorg.libXrandr diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 93e711a4a86..09c0e0d25c6 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libintl }: +{ lib, stdenv, fetchurl, pkg-config, glib, libintl }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1nc3bwjdrpcrkbdmzvhckq0yngbcxspwj2n1r7jr3gmx1jk5vpm1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libintl ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 4879e186b5a..570535f80e4 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , tokyocabinet, ncurses , cairo ? null, pango ? null , enableCairo ? stdenv.isLinux @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ tokyocabinet ncurses ] ++ lib.optionals enableCairo [ cairo pango ]; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 53aa696a4fd..516c9e42617 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig }: +{lib, stdenv, fetchurl, pkg-config }: stdenv.mkDerivation rec { pname = "eot_utilities"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0cb41riabss23hgfg7vxhky09d6zqwjy1nxdvr3l2bh5qzd4kvaf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { homepage = "http://www.w3.org/Tools/eot-utils/"; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 890edc5d0ca..83aa6c505d3 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkgconfig, zlib +{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, cmake, perl, pkg-config, zlib , darwin, libiconv, installShellFiles }: @@ -26,7 +26,7 @@ buildRustPackage rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig perl installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config perl installShellFiles ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ] diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 743d930fdf8..4c92a0be792 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkgconfig, openssl +{ lib, stdenv, fetchFromGitLab, rustPlatform, cmake, pkg-config, openssl , darwin, installShellFiles , x11Support ? stdenv.isLinux || stdenv.hostPlatform.isBSD @@ -27,7 +27,7 @@ buildRustPackage rec { cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w"; - nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; + nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security AppKit ]) else [ openssl ]; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 47d4fd12757..8fcfa9acb1f 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -3,7 +3,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , libftdi1 , libusb1 , pciutils @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; mesonFlags = lib.optionals stdenv.isAarch64 [ "-Dpciutils=false" ]; - nativeBuildInputs = [ meson pkgconfig ninja ]; + nativeBuildInputs = [ meson pkg-config ninja ]; buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 0e1671071bd..2140e405ff4 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib , fetchpatch -, cmake, perl, uthash, pkgconfig, gettext +, cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist , withSpiro ? false, libspiro @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # do not use x87's 80-bit arithmetic, rouding errors result in very different font binaries NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isi686 "-msse2 -mfpmath=sse"; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ readline uthash woff2 zeromq libuninameslist python freetype zlib glib libungif libpng libjpeg libtiff libxml2 diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index b3864aff44b..4d072e6d2bf 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, autoreconfHook, makeWrapper, pkg-config , zlib, lzma, bzip2, mtools, dosfstools, zip, unzip, libconfuse, libsodium , libarchive, darwin, coreutils }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; patches = lib.optional stdenv.isDarwin [ ./fix-testrunner-darwin.patch ]; - nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zlib lzma bzip2 libconfuse libsodium libarchive ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.DiskArbitration diff --git a/pkgs/tools/misc/g933-utils/default.nix b/pkgs/tools/misc/g933-utils/default.nix index 67e3b3b6ea3..9cb05609772 100644 --- a/pkgs/tools/misc/g933-utils/default.nix +++ b/pkgs/tools/misc/g933-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, udev, pkg-config }: rustPlatform.buildRustPackage rec { pname = "g933-utils"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16xgk4rc36d6lylh2dzv63ryq9s7fli3h2qva1m1p6f0gpasnk7w"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; meta = with lib; { diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 5856a73781e..ded2864dbc6 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -1,4 +1,4 @@ - { lib, stdenv, fetchurl, pkgconfig, freetype, gtk }: + { lib, stdenv, fetchurl, pkg-config, freetype, gtk }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype gtk ]; patches = [ ./Makefile.patch ]; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 13f2691e69f..9803e8db016 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez +{ lib, stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkg-config, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl intltool gettext libusb-compat-0_1 - glib gtk2 pkgconfig bluez readline + glib gtk2 pkg-config bluez readline libXpm pcsclite libical ]; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 57504f8a3ab..4a02e921f47 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, libmaxminddb, fetchpatch }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }: stdenv.mkDerivation rec { version = "1.4"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { "--enable-utf8" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libmaxminddb ncurses diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 849db12cfa7..b1884da5553 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 -, gnugrep, parted, glib, libuuid, pkgconfig, gtkmm3, libxml2 +, gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ intltool gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ]; preFixup = '' gappsWrapperArgs+=( diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index d3761f34cda..a94275d7e35 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python3 pkgconfig autoconf automake ]; + nativeBuildInputs = [ bison flex python3 pkg-config autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index b86c3cc75e3..2dffada9fe7 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkgconfig, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }: stdenv.mkDerivation rec { version="1.1.3"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ./fix-paths.patch ]; - nativeBuildInputs = [ autoreconfHook gettext pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 36b1770791b..edda48bdc92 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "hashit"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/tools/misc/hhpc/default.nix b/pkgs/tools/misc/hhpc/default.nix index a4ba369665e..5f02121e59f 100644 --- a/pkgs/tools/misc/hhpc/default.nix +++ b/pkgs/tools/misc/hhpc/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, xorg, pkgconfig}: +{lib, stdenv, fetchFromGitHub, xorg, pkg-config}: stdenv.mkDerivation rec { pname = "hhpc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1djsw1r38mh6zx0rbyn2cfa931hyddib4fl3i27c4z7xinl709ss"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorg.libX11 ]; installPhase = '' diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 9d1857c1136..f25c2eb62f6 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, usbmuxd, libzip, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, usbmuxd, libzip, libimobiledevice }: stdenv.mkDerivation rec { pname = "ideviceinstaller"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1xp0sjgfx2z19x9mxihn18ybsmrnrcfc55zbh5a44g3vrmagmlzz"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; + nativeBuildInputs = [ autoreconfHook pkg-config usbmuxd libimobiledevice libzip ]; meta = with lib; { homepage = "https://github.com/libimobiledevice/ideviceinstaller"; diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index 605b7bfc3ce..3e4739ee032 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , curl , libimobiledevice , libirecovery @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/misc/journaldriver/default.nix b/pkgs/tools/misc/journaldriver/default.nix index 77df7ab6908..70460d86fc9 100644 --- a/pkgs/tools/misc/journaldriver/default.nix +++ b/pkgs/tools/misc/journaldriver/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl, systemd }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, systemd }: rustPlatform.buildRustPackage rec { pname = "journaldriver"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ openssl systemd ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = with lib; { description = "Log forwarder from journald to Stackdriver Logging"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 6e7fcfa62b6..9b57a295de0 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkgconfig, cyrus_sasl, autoconf, automake }: +{ lib, stdenv, fetchgit, openldap, openssl, popt, glib, ncurses, readline, pkg-config, cyrus_sasl, autoconf, automake }: stdenv.mkDerivation { pname = "ldapvi"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "3ef3103030ecb04d7fe80180e3fd490377cf81fb2af96782323fddabc3225030"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openldap openssl popt glib ncurses readline cyrus_sasl autoconf automake ]; preConfigure = '' diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 4a965cbe165..a826f3a0de5 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkgconfig, libuuid, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, gtk-doc, pkg-config, libuuid, libtool, readline, gobject-introspection, json-glib, lvm2, libxslt, docbook_xsl , fetchpatch }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureScript = "sh autogen.sh"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gtk-doc lvm2 libxslt.bin libtool readline gobject-introspection json-glib libuuid ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index 71a9233fab5..6f9c07209cf 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libbitcoin libbitcoin-protocol ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index fe7290f801b..dd0ed857314 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin-client libbitcoin-network ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index 42f3669cad0..48dab31e9a8 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, zeromq }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin zeromq ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 469e7e83085..1d8af4a336b 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libbitcoin secp256k1 ]; propagatedBuildInputs = [ zeromq ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 5198676cb75..122aed696fc 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, secp256k1 }: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation { sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ secp256k1 ]; diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index 58c6c1d5351..729dc41a107 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkgconfig }: +{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }: stdenv.mkDerivation rec { version = "4.05"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "doc" "man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ e2fsprogs openldap ]; meta = with lib; { diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 5f2c7a751bd..44cb6962b8e 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: +{ lib, stdenv, fetchurl, pkg-config, libpipeline, db, groff, libiconv, makeWrapper, buildPackages }: stdenv.mkDerivation rec { name = "man-db-2.9.3"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig makeWrapper groff ]; + nativeBuildInputs = [ pkg-config makeWrapper groff ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) checkInputs = [ libiconv /* for 'iconv' binary */ ]; diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 153c0d59389..674b39c51af 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , glib , gpm , file @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { sha256 = "12jlnabnc91xsm35g99g2wnh96jmznvrhffd18rj7fqfy8brdhgz"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ file diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index aedaa364888..1c327365916 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, glib, readline -, bison, flex, pkgconfig, autoreconfHook, libxslt, makeWrapper +, bison, flex, pkg-config, autoreconfHook, libxslt, makeWrapper , txt2man, which # withUi currently doesn't work. It compiles but fails to run. , withUi ? false, gtk2, gnome2 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-scrollkeeper" ]; nativeBuildInputs = [ - pkgconfig bison flex autoreconfHook txt2man which + pkg-config bison flex autoreconfHook txt2man which ] ++ lib.optional withUi libxslt; buildInputs = [ glib readline ] ++ lib.optionals withUi uiDeps; diff --git a/pkgs/tools/misc/microplane/deps.nix b/pkgs/tools/misc/microplane/deps.nix index f415bae4507..defbd0d573c 100644 --- a/pkgs/tools/misc/microplane/deps.nix +++ b/pkgs/tools/misc/microplane/deps.nix @@ -225,4 +225,4 @@ sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; }; } -] \ No newline at end of file +] diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 15df26d5cc6..d237c3b7fdd 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkgconfig +{ lib, stdenv, fetchgit, autoreconfHook, makeWrapper, pkg-config , lrzsz, ncurses, libiconv }: stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ] ++ lib.optional stdenv.isDarwin libiconv; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index d497505d9b7..0415955e092 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -3,7 +3,7 @@ , buildGoPackage , fetchFromGitHub , openssl -, pkgconfig +, pkg-config , libpcap }: @@ -35,7 +35,7 @@ in buildGoPackage { sha256 = "0mjwvx0cxvb6zam6jyr3753xjnwcygxcjzqhhlsq0b3xnwws9yh7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl libpcap ]; # Mongodb incorrectly names all of their binaries main diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 4e033a44cfd..182e844eb84 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, boost, libgcrypt, systemd, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdscribble"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; meta = with lib; { diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix index 03e7fbb5c02..c906443b07c 100644 --- a/pkgs/tools/misc/notify-desktop/default.nix +++ b/pkgs/tools/misc/notify-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, dbus, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, dbus, pkg-config }: stdenv.mkDerivation { pname = "notify-desktop"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1brcvl2fx0yzxj9mc8hzfl32zdka1f1bxpzsclcsjplyakyinr1a"; }; - buildInputs = [ dbus pkgconfig ]; + buildInputs = [ dbus pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/tools/misc/opencorsairlink/default.nix b/pkgs/tools/misc/opencorsairlink/default.nix index 345df9cfbf4..14f955be1cd 100644 --- a/pkgs/tools/misc/opencorsairlink/default.nix +++ b/pkgs/tools/misc/opencorsairlink/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, libusb1, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libusb1, pkg-config }: stdenv.mkDerivation rec { name = "OpenCorsairLink-${version}"; version = "2019-12-23"; buildInputs = [ libusb1 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 298a7da6e2a..e7a5d38a916 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, meson, ninja, gettext, glib, libxml2, perl, python3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, glib, libxml2, perl, python3 , libxslt, libarchive, bzip2, lzma, json-glib, libsoup }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "038q3gzdbkfkhpicj0755mw1q4gbvn57pslpw8n2dp3lds9im0g9"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext perl python3 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext perl python3 ]; buildInputs = [ glib json-glib libxml2 libxslt libarchive bzip2 lzma libsoup ]; meta = with lib; { diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 6be42f576a4..635c6e0b524 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, glib, gettext, readline, pkgconfig }: +{lib, stdenv, fetchurl, glib, gettext, readline, pkg-config }: stdenv.mkDerivation rec { name = "pal-0.4.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gettext readline ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/paps/default.nix b/pkgs/tools/misc/paps/default.nix index 3a8040bd5f1..ca6607b2f18 100644 --- a/pkgs/tools/misc/paps/default.nix +++ b/pkgs/tools/misc/paps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoconf, automake, pkgconfig, intltool, pango }: +, autoconf, automake, pkg-config, intltool, pango }: stdenv.mkDerivation rec { pname = "paps"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495"; }; - nativeBuildInputs = [ autoconf automake pkgconfig intltool ]; + nativeBuildInputs = [ autoconf automake pkg-config intltool ]; buildInputs = [ pango ]; preConfigure = '' diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 861d83bcfce..615e9e528d7 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook -, gtk2, hicolor-icon-theme, intltool, pkgconfig +, gtk2, hicolor-icon-theme, intltool, pkg-config , which, wrapGAppsHook, xdotool }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ gtk2 hicolor-icon-theme ]; NIX_LDFLAGS = "-lgio-2.0"; diff --git a/pkgs/tools/misc/pick/default.nix b/pkgs/tools/misc/pick/default.nix index ac446e7f341..a8203978fee 100644 --- a/pkgs/tools/misc/pick/default.nix +++ b/pkgs/tools/misc/pick/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "pick"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; meta = with lib; { inherit (src.meta) homepage; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index c7aff75dca5..112010c8008 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , gettext , libxml2 -, pkgconfig +, pkg-config , gtk3 , cmake , ninja @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config wrapGAppsHook vala cmake diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix index 6df48f0effb..4e5a3476f53 100644 --- a/pkgs/tools/misc/powerline-rs/default.nix +++ b/pkgs/tools/misc/powerline-rs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitLab, pkgconfig, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitLab, pkg-config, file, perl, curl, cmake, openssl, libssh2, libgit2, libzip, Security }: rustPlatform.buildRustPackage rec { pname = "powerline-rs"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0a41a6kgwgz4040c2369jldvk6xy6s6fkgayca0qy7hdwc4bcxdp"; - nativeBuildInputs = [ pkgconfig file perl cmake curl ]; + nativeBuildInputs = [ pkg-config file perl cmake curl ]; buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security; COMPLETION_OUT = "out"; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index dbf844a4f9d..4f27cd239d1 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, which }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, which }: stdenv.mkDerivation rec { pname = "progress"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1cnb4ixlhshn139mj5sr42k5m6gjjbyqvkn1324c47niwrgp7dqm"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1ec6864fe6c..9159de9fd8c 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline, postgresql }: +{ lib, stdenv, fetchFromGitHub, gnugrep, ncurses, pkg-config, readline, postgresql }: stdenv.mkDerivation rec { pname = "pspg"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnugrep ncurses readline postgresql ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 185f0ca2816..7fc578ec857 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, pkgconfig, libX11, libXtst, qt4 }: +{ lib, stdenv, fetchurl, pkg-config, libX11, libXtst, qt4 }: stdenv.mkDerivation rec { name = "qjoypad-4.1.0"; src = fetchurl { url = "mirror://sourceforge/qjoypad/${name}.tar.gz"; sha256 = "1jlm7i26nfp185xrl41kz5z6fgvyj51bjpz48cg27xx64y40iamm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXtst qt4 ]; NIX_LDFLAGS = "-lX11"; patchPhase = '' diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index ca8fe489c16..c60dd9f7c7a 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, file , protobufc }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { name = "riemann-c-client-1.10.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "01gzqxqm1xvki2vd78c7my2kgp4fyhkcf5j5fmy8z0l93lgj82rr"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ file protobufc ]; preBuild = '' diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 0d0095645af..09ebbe33a34 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -9,7 +9,7 @@ , libelf , makeWrapper , pango -, pkgconfig +, pkg-config , polkit , python3 , scons @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { CFLAGS="-I${lib.getDev util-linux}/include"; nativeBuildInputs = [ - pkgconfig + pkg-config sphinx gettext scons diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 3e1e504e107..a75b90d6f54 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cryptopp +{ lib, stdenv, fetchurl, pkg-config, cryptopp , libusb1, qtbase, qttools, makeWrapper , qmake, withEspeak ? false, espeak ? null , qt5 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cryptopp libusb1 qtbase qttools ] ++ lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ makeWrapper pkg-config qmake qt5.wrapQtAppsHook ]; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 63c0f90079b..9d95085296f 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -6,7 +6,7 @@ , autoconf , automake , libtool -, pkgconfig +, pkg-config , cargo , rustc , gobject-introspection @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which autoconf automake diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 90d1e02b0df..225ed2e7824 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gettext, perl, pkgconfig, libxml2, pango, cairo, groff +{ fetchurl, lib, stdenv, gettext, perl, pkg-config, libxml2, pango, cairo, groff , tcl-8_5, darwin }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1nsqra0g2nja19akmf9x5y9hhgc35ml3w9dcdz2ayz7zgvmzm6d1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext perl libxml2 pango cairo groff ] ++ lib.optionals stdenv.isDarwin [ tcl-8_5 darwin.apple_sdk.frameworks.ApplicationServices ]; diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/tools/misc/sd-mux-ctrl/default.nix index 487307d3224..d42909a5c77 100644 --- a/pkgs/tools/misc/sd-mux-ctrl/default.nix +++ b/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: +{ lib, stdenv, fetchgit, cmake, pkg-config, libftdi1, popt}: stdenv.mkDerivation rec { pname = "sd-mux-ctrl-unstable"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libftdi1 popt ]; diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 56c9541c2e0..1ff73492401 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -2,7 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , llvmPackages , expat @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { ++ lib.optionals stdenv.isLinux [ libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit CoreText Security ]; - nativeBuildInputs = [ cmake pkgconfig ] + nativeBuildInputs = [ cmake pkg-config ] ++ lib.optionals stdenv.isLinux [ python3 ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index 158c62e60e9..a4a65e37e4e 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu , cppcheck }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1k8xxb4rj2fylr4vj16yvsf73cyywliz9cy78pl4ibmi03jhg837"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] ++ lib.optional doCheck cppcheck; diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index c249419d589..5dfe76d7ebb 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45 +, autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45 , acl, attr, boost, btrfs-progs, dbus, diffutils, e2fsprogs, libxml2 , lvm2, pam, python, util-linux, fetchpatch, json_c, nixosTests , ncurses }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config docbook_xsl libxslt docbook_xml_dtd_45 ]; buildInputs = [ diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index 86b2941eed1..b9698e1e536 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, xmlrpc_c, glib, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, xmlrpc_c, glib, zlib }: stdenv.mkDerivation rec { pname = "subberthehut"; version = "20"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19prdqbk19h0wak318g2jn1mnfm7l7f83a633bh0rhskysmqrsj1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ xmlrpc_c glib zlib ]; installPhase = '' diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 08496bc1185..1781187481f 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, fetchpatch, udev, intltool, pkg-config, glib, xmlto, wrapGAppsHook , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - intltool pkgconfig + intltool pkg-config xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython wrapGAppsHook autoreconfHook diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index d7d699d2ba4..e898ded8154 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: +{ lib, stdenv, pkg-config, libappindicator-gtk3, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "systrayhelper"; @@ -24,7 +24,7 @@ buildGoPackage rec { -w '' ]; - nativeBuildInputs = [ pkgconfig libappindicator-gtk3 ]; + nativeBuildInputs = [ pkg-config libappindicator-gtk3 ]; buildInputs = [ libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index a9afcfd4091..84bfdc55d7f 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -1,4 +1,4 @@ -{ pkgconfig, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: +{ pkg-config, lib, stdenv, rustPlatform, rustc, cargo, docker, openssl, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "tensorman"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index c6c4886a3b4..63c4fd36ff6 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkgconfig }: +{ lib, stdenv, fetchurl, alsaLib, libjack2, ncurses, pkg-config }: stdenv.mkDerivation { name = "timidity-2.15.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./timidity-iA-Oj.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib libjack2 ncurses ]; configureFlags = [ "--enable-audio=oss,alsa,jack" "--enable-alsaseq" "--with-default-output=alsa" "--enable-ncurses" ]; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index e4f43b5007c..25eee1c7b83 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, curl, libzip, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, curl, libzip, pkg-config }: stdenv.mkDerivation rec { pname = "tldr"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ curl libzip ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = ["CC=cc" "LD=cc" "CFLAGS="]; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 5f1b8d23646..d43d94cc8ed 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkg-config , zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; + nativeBuildInputs = [ autoreconfHook cmake pkg-config ]; meta = with lib; { homepage = "https://tmate.io/"; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 32d27da67d4..4e5ca70b955 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , makeWrapper , bison , ncurses @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoreconfHook bison ]; diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index 3dba479f039..41eaa6b03bf 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libcaca }: +{ lib, stdenv, fetchurl, pkg-config, libcaca }: stdenv.mkDerivation rec { pname = "toilet"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1pl118qb7g0frpgl9ps43w4sd0psjirpmq54yg1kqcclqcqbbm49"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libcaca ]; meta = with lib; { diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 1e73f716a7a..9e88e5da4f8 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,5 +1,5 @@ { - stdenv, lib, fetchurl, pkgconfig, autoreconfHook + stdenv, lib, fetchurl, pkg-config, autoreconfHook , freetype, harfbuzz, libiconv, qtbase , enableGUI ? true }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "macx-g++" "macx-clang" ''; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index dd7b1fae862..5e541345410 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, cmake, perl, pkgconfig +, cmake, perl, pkg-config , openssl, curl, libusb1, protobufc , enableUnsafe ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "07nd4dbkchxy8js1h1f6pzn63pls2afww97wyiiw6zid43mpqyg4"; }; - nativeBuildInputs = [ cmake perl pkgconfig ]; + nativeBuildInputs = [ cmake perl pkg-config ]; buildInputs = [ openssl curl libusb1 protobufc ]; cmakeFlags = lib.optional enableUnsafe [ "-Dunsafe=on" ]; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index bc253a1d23b..4d78e7f3f93 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "tty-clock"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16v3pmva13skpfjja96zacjpxrwzs1nb1iqmrp2qzvdbcm9061pp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index 923f6e7a3a4..990547291f6 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub -, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }: +, qmake, qtbase, pkg-config, taglib, libbass, libbass_fx }: # TODO: get rid of (unfree) libbass # issue:https://github.com/UltraStar-Deluxe/UltraStar-Creator/issues/3 @@ -33,7 +33,7 @@ mkDerivation { cd src ''; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase taglib libbass libbass_fx ]; meta = with lib; { diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 64221a92139..f69955020c7 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins +{ lib, mkDerivation, fetchFromGitHub, pkg-config, symlinkJoin, qmake, diffPlugins , qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }: let @@ -109,7 +109,7 @@ in mkDerivation { make install ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; inherit buildInputs; meta = with lib; { diff --git a/pkgs/tools/misc/unclutter-xfixes/default.nix b/pkgs/tools/misc/unclutter-xfixes/default.nix index 95c2cbb7625..464183cf579 100644 --- a/pkgs/tools/misc/unclutter-xfixes/default.nix +++ b/pkgs/tools/misc/unclutter-xfixes/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, xlibsWrapper, libev, libXi, libXfixes, - pkgconfig, asciidoc, libxslt, docbook_xsl }: + pkg-config, asciidoc, libxslt, docbook_xsl }: stdenv.mkDerivation rec { pname = "unclutter-xfixes"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "148m4wx8v57s3l2wb69y9imb00y8ca2li27hsxibwnl1wrkb7z4b"; }; - nativeBuildInputs = [ pkgconfig asciidoc libxslt docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc libxslt docbook_xsl ]; buildInputs = [ xlibsWrapper libev libXi libXfixes ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index d6be71c63b2..d75d462fc8e 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison +{ lib, stdenv, autoconf, automake, pkg-config, gettext, libtool, bison , flex, which, subversion, fetchurl, makeWrapper, libftdi1, libusb-compat-0_1, readline , python3 , svfSupport ? true @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1k2vmvvarik0q3llbfbk8ad35mcns7w1ln9gla1mn7z9c6x6x90r"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gettext autoconf automake libtool bison flex which subversion makeWrapper readline libftdi1 libusb-compat-0_1 python3 ]; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 68d972e5968..d001db4d3cb 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, libimobiledevice }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libusb1, libimobiledevice }: stdenv.mkDerivation rec { pname = "usbmuxd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0a2xgrb4b3ndam448z74wh1267nmrz1wcbpx4xz86pwbdc93snab"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; propagatedBuildInputs = [ libimobiledevice libusb1 ]; preConfigure = '' diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 1a3afb0d65f..d5f09d9f9fa 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security, makeWrapper, bash }: +{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=ssl" ]; cargoSha256 = "1hsms8rlnds8npr8m0dm21h04ci5ljda09pqb598v7ny3j2dldiq"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; # The wrapping is required so that the "sh-c" option of websocat works even diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 3904a1a03bc..676ff03ad9b 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config , wayland, wayland-protocols }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0c4w87ipsw09aii34szj9p0xfy0m00wyjpll0gb0aqmwa60p0c5d"; }; - nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; buildInputs = [ wayland ]; meta = with lib; { diff --git a/pkgs/tools/misc/wlr-randr/default.nix b/pkgs/tools/misc/wlr-randr/default.nix index 5f0fec9fe61..85011baacae 100644 --- a/pkgs/tools/misc/wlr-randr/default.nix +++ b/pkgs/tools/misc/wlr-randr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkgconfig, wayland }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, cmake, pkg-config, wayland }: stdenv.mkDerivation rec { pname = "wlr-randr"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10c8zzp78s5bw34vvjhilipa28bsdx3jbyhnxgp8f8kawh3cvgsc"; }; - nativeBuildInputs = [ meson ninja cmake pkgconfig ]; + nativeBuildInputs = [ meson ninja cmake pkg-config ]; buildInputs = [ wayland ]; meta = with lib; { diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix index 36ad53e00d0..32cdeaa2886 100644 --- a/pkgs/tools/misc/wv/default.nix +++ b/pkgs/tools/misc/wv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkgconfig, libgsf +{ lib, stdenv, fetchurl, zlib, imagemagick, libpng, glib, pkg-config, libgsf , libxml2, bzip2 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "17f16lkdv1c3amaz2hagiicih59ynpp4786k1m2qa1sw68xhswsc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib imagemagick libpng glib libgsf libxml2 bzip2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index bf91e966239..f3fdc7e2227 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig +{ lib, stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkg-config , gccCross ? null }: @@ -29,7 +29,7 @@ stdenv.mkDerivation { # Not to strip cross build binaries (this is for the gcc-cross-wrapper) dontCrossStrip = true; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ lib.optional (gccCross != null) gccCross; diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index 8b9b30d56d4..7569045fa4f 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libX11, libXrandr, glib, colord }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libX11, libXrandr, glib, colord }: stdenv.mkDerivation rec { pname = "xiccd"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "159fyz5535lcabi5bzmxgmjdgxlqcjaiqgzr00mi3ax0i5fdldwn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libX11 libXrandr glib colord ]; meta = with lib; { diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index b28b5397e62..84d4833d63e 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, autoreconfHook, wrapGAppsHook , gtk3, hicolor-icon-theme, netpbm }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 hicolor-icon-theme ]; - nativeBuildInputs = [ autoreconfHook pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config intltool wrapGAppsHook ]; postPatch = '' sed -i src/file.c -e '21i#include <glib/gprintf.h>' diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 188b7fa6b28..827eaec048f 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, openssl, check, pcsclite, PCSC +{ lib, stdenv, fetchurl, pkg-config, openssl, check, pcsclite, PCSC , withApplePCSC ? stdenv.isDarwin }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "124lhlim05gw32ydjh1yawqbnx6wdllz1ir9j00j09wji3m11rfs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl check ] ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 99187ef548f..6934791da8e 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, mkDerivation, pkgconfig, qtbase, qmake, imagemagick +{ lib, stdenv, fetchurl, mkDerivation, pkg-config, qtbase, qmake, imagemagick , libyubikey, yubikey-personalization }: mkDerivation rec { @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8"; }; - nativeBuildInputs = [ pkgconfig qmake imagemagick ]; + nativeBuildInputs = [ pkg-config qmake imagemagick ]; buildInputs = [ yubikey-personalization qtbase libyubikey ]; installPhase = '' diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 1830af6a9bc..59739e06aa0 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libusb1, libyubikey, json_c }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libusb1, libyubikey, json_c }: stdenv.mkDerivation rec { pname = "yubikey-personalization"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 libyubikey json_c ]; configureFlags = [ |