From 76f93cc7313a1c32f7d76cf07c154e7bcafe251c Mon Sep 17 00:00:00 2001 From: Ben Siraphob Date: Sun, 17 Jan 2021 10:51:22 +0700 Subject: pkgs/tools: pkgconfig -> pkg-config --- pkgs/tools/security/acsccid/default.nix | 4 ++-- pkgs/tools/security/afl/qemu.nix | 4 ++-- pkgs/tools/security/aflplusplus/qemu.nix | 4 ++-- pkgs/tools/security/aws-okta/default.nix | 4 ++-- pkgs/tools/security/bitwarden_rs/default.nix | 4 ++-- pkgs/tools/security/ccid/default.nix | 4 ++-- pkgs/tools/security/chaps/default.nix | 4 ++-- pkgs/tools/security/chrome-token-signing/default.nix | 4 ++-- pkgs/tools/security/clevis/default.nix | 4 ++-- pkgs/tools/security/crackxls/default.nix | 4 ++-- pkgs/tools/security/ecdsautils/default.nix | 2 +- pkgs/tools/security/ecryptfs/default.nix | 4 ++-- pkgs/tools/security/eid-mw/default.nix | 4 ++-- pkgs/tools/security/fpm2/default.nix | 4 ++-- pkgs/tools/security/fprintd/default.nix | 4 ++-- pkgs/tools/security/gencfsm/default.nix | 4 ++-- pkgs/tools/security/gnupg-pkcs11-scd/default.nix | 4 ++-- pkgs/tools/security/gnupg/22.nix | 4 ++-- pkgs/tools/security/ifdnfc/default.nix | 4 ++-- pkgs/tools/security/keycard-cli/default.nix | 4 ++-- pkgs/tools/security/kwalletcli/default.nix | 4 ++-- pkgs/tools/security/lastpass-cli/default.nix | 4 ++-- pkgs/tools/security/libacr38u/default.nix | 4 ++-- pkgs/tools/security/libmodsecurity/default.nix | 4 ++-- pkgs/tools/security/mfcuk/default.nix | 4 ++-- pkgs/tools/security/mfoc/default.nix | 4 ++-- pkgs/tools/security/modsecurity/default.nix | 4 ++-- pkgs/tools/security/neopg/default.nix | 4 ++-- pkgs/tools/security/nitrokey-app/default.nix | 4 ++-- pkgs/tools/security/nmap/default.nix | 4 ++-- pkgs/tools/security/nmap/qt.nix | 4 ++-- pkgs/tools/security/nsjail/default.nix | 4 ++-- pkgs/tools/security/nwipe/default.nix | 4 ++-- pkgs/tools/security/oath-toolkit/default.nix | 4 ++-- pkgs/tools/security/opensc/default.nix | 4 ++-- pkgs/tools/security/pcsc-cyberjack/default.nix | 4 ++-- pkgs/tools/security/pcsclite/default.nix | 4 ++-- pkgs/tools/security/pcsctools/default.nix | 4 ++-- pkgs/tools/security/pinentry/default.nix | 4 ++-- pkgs/tools/security/polkit-gnome/default.nix | 4 ++-- pkgs/tools/security/proxmark3/default.nix | 4 ++-- pkgs/tools/security/qdigidoc/default.nix | 4 ++-- pkgs/tools/security/rbw/default.nix | 4 ++-- pkgs/tools/security/ripasso/cursive.nix | 4 ++-- pkgs/tools/security/rng-tools/default.nix | 4 ++-- pkgs/tools/security/sbsigntool/default.nix | 4 ++-- pkgs/tools/security/signify/default.nix | 4 ++-- pkgs/tools/security/sn0int/default.nix | 4 ++-- pkgs/tools/security/stoken/default.nix | 4 ++-- pkgs/tools/security/thc-hydra/default.nix | 4 ++-- pkgs/tools/security/tor/default.nix | 4 ++-- pkgs/tools/security/tpm2-tools/default.nix | 4 ++-- pkgs/tools/security/trousers/default.nix | 4 ++-- pkgs/tools/security/yubikey-agent/default.nix | 4 ++-- pkgs/tools/security/zmap/default.nix | 4 ++-- pkgs/tools/security/zzuf/default.nix | 4 ++-- 56 files changed, 111 insertions(+), 111 deletions(-) (limited to 'pkgs/tools/security') diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index eb31bf0cdeb..da461a96957 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -6,7 +6,7 @@ , gettext , flex , perl -, pkgconfig +, pkg-config , pcsclite , libusb1 , libiconv @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoconf automake libtool diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index b2c1618ed79..b88da7599d1 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, afl, python2, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - python2 perl pkgconfig flex bison autoconf texinfo + python2 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ diff --git a/pkgs/tools/security/aflplusplus/qemu.nix b/pkgs/tools/security/aflplusplus/qemu.nix index 74e081b95a3..0a98f27182b 100644 --- a/pkgs/tools/security/aflplusplus/qemu.nix +++ b/pkgs/tools/security/aflplusplus/qemu.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkgconfig, glib, perl +{ lib, stdenv, fetchurl, aflplusplus, python2, zlib, pkg-config, glib, perl , texinfo, libuuid, flex, bison, pixman, autoconf }: @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ - python2 perl pkgconfig flex bison autoconf texinfo + python2 perl pkg-config flex bison autoconf texinfo ]; buildInputs = [ diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index de84e43b5aa..e6672e1b3d9 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -1,4 +1,4 @@ -{ buildGoPackage, fetchFromGitHub, libusb1, pkgconfig, lib, stdenv, libiconv }: +{ buildGoPackage, fetchFromGitHub, libusb1, pkg-config, lib, stdenv, libiconv }: buildGoPackage rec { pname = "aws-okta"; @@ -17,7 +17,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=-X main.Version=${version}" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 libiconv ]; meta = with lib; { diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index d2321523b32..3b623cefd0d 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, nixosTests -, pkgconfig, openssl +, pkg-config, openssl , Security, CoreServices , dbBackend ? "sqlite", libmysqlclient, postgresql }: @@ -17,7 +17,7 @@ in rustPlatform.buildRustPackage rec { sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 1be561dae54..b20b513ac28 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: +{ lib, stdenv, fetchurl, pcsclite, pkg-config, libusb1, perl }: stdenv.mkDerivation rec { pname = "ccid"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers") ''; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ pcsclite libusb1 ]; meta = with lib; { diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index 0200fca8ff3..2f89c3ea585 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitiles, fetchFromGitHub, fetchurl, trousers, leveldb, unzip -, scons, pkgconfig, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam +, scons, pkg-config, glib, dbus_cplusplus, dbus, protobuf, openssl, snappy, pam }: let @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { substituteInPlace makefile --replace @@NIXOS_LEVELDB@@ ${leveldb} ''; - nativeBuildInputs = [ unzip scons pkgconfig ]; + nativeBuildInputs = [ unzip scons pkg-config ]; buildInputs = [ trousers glib dbus_cplusplus dbus protobuf openssl snappy leveldb pam ]; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 134f916f043..4966c6412ab 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkgconfig, opensc }: +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pcsclite, pkg-config, opensc }: mkDerivation rec { pname = "chrome-token-signing"; @@ -11,7 +11,7 @@ mkDerivation rec { sha256 = "1vbghy12fjmq4m5l7hisq1ylnzy0rdnnd920xwamjamlx38jj3ln"; }; - buildInputs = [ qmake pcsclite pkgconfig ]; + buildInputs = [ qmake pcsclite pkg-config ]; dontUseQmakeConfigure = true; patchPhase = '' diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 0b8f50c1190..36b5ab47304 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, asciidoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, asciidoc , jansson, jose, cryptsetup, curl, libpwquality, luksmeta }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz"; }; - nativeBuildInputs = [ meson ninja pkgconfig asciidoc ]; + nativeBuildInputs = [ meson ninja pkg-config asciidoc ]; buildInputs = [ jansson jose cryptsetup curl libpwquality luksmeta ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 33a219e8621..748bfdcb2ca 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, openssl, libgsf, gmp }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, openssl, libgsf, gmp }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake openssl libgsf gmp ]; installPhase = diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index adf1a74f42a..6c126673259 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "18sr8x3qiw8s9l5pfi7r9i3ayplz4jqdml75ga9y933vj7vs0k4d"; }; - nativeBuildInputs = with pkgs; [ cmake pkgconfig doxygen ]; + nativeBuildInputs = with pkgs; [ cmake pkg-config doxygen ]; buildInputs = with pkgs; [ libuecc ]; meta = with lib; { diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index a49c6713e09..569b83feb9a 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false +{ lib, stdenv, fetchurl, pkg-config, perl, util-linux, keyutils, nss, nspr, python2, pam, enablePython ? false , intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { configureFlags = lib.optionals (!enablePython) [ "--disable-pywrap" ]; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkg-config ] # if python2 support is requested, it is needed at builtime as well as runtime. ++ lib.optionals (enablePython) [ python2 ] ; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 116add24314..cbe56694da1 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig +, autoreconfHook, pkg-config , gtk3, nssTools, pcsclite , libxml2, libproxy , openssl, curl @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "Fedict"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper ]; buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ]; preConfigure = '' mkdir openssl diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index 1837fc6d850..0ca45957d69 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gnupg, gtk2 +{ lib, stdenv, fetchurl, pkg-config, gnupg, gtk2 , libxml2, intltool }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "d55e9ce6be38a44fc1053d82db2d117cf3991a51898bd86d7913bae769f04da7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnupg gtk2 libxml2 intltool ]; meta = { diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 14a9427b0f1..72c0bc204f8 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , fetchpatch -, pkgconfig +, pkg-config , meson , ninja , perl @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja perl diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index a41c995ab40..d19f07595e8 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkgconfig, encfs +{ lib, stdenv, fetchurl, autoconf, automake, intltool, libtool, pkg-config, encfs , glib , gnome3, gtk3, libgnome-keyring, vala, wrapGAppsHook, xorg, gobject-introspection }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake intltool libtool vala glib encfs gtk3 libgnome-keyring gnome3.libgee xorg.libSM xorg.libICE wrapGAppsHook gobject-introspection ]; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index eb0553ed083..c8accce7d40 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libgpgerror, libassuan, libgcrypt, pkcs11helper, - pkgconfig, openssl }: + pkg-config, openssl }: stdenv.mkDerivation rec { pname = "gnupg-pkcs11-scd"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1mfh9zjbahjd788rq1mzx009pd7p1sq62sbz586rd7szif7pkpgx"; }; - buildInputs = [ pkcs11helper pkgconfig openssl ]; + buildInputs = [ pkcs11helper pkg-config openssl ]; configureFlags = [ "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 8dd0c779c3b..90ae4300fa6 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, lib, stdenv, pkgconfig, libgcrypt, libassuan, libksba +{ fetchurl, fetchpatch, lib, stdenv, pkg-config, libgcrypt, libassuan, libksba , libgpgerror, libiconv, npth, gettext, texinfo, buildPackages # Each of the dependencies below are optional. @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig texinfo ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext readline libusb1 gnutls adns openldap zlib bzip2 sqlite diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index 648774c5867..34c140023ac 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub , pkgconfig +{ lib, stdenv, fetchFromGitHub , pkg-config , pcsclite , autoreconfHook , libnfc @@ -14,7 +14,7 @@ stdenv.mkDerivation { rev = "0e48e8e"; sha256 = "1cxnvhhlcbm8h49rlw5racspb85fmwqqhd3gzzpzy68vrs0b37vg"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ pcsclite libnfc ]; configureFlags = [ "--prefix=$(out)" ]; diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index 73eab6c3dec..4c276cb6e90 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, pkgconfig, pcsclite }: +{ lib, buildGoPackage, fetchFromGitHub, pkg-config, pcsclite }: buildGoPackage rec { pname = "keycard-cli"; @@ -7,7 +7,7 @@ buildGoPackage rec { goPackagePath = "github.com/status-im/keycard-cli"; subPackages = [ "." ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite ]; src = fetchFromGitHub { diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index d03de5f7cfc..c1849bdca39 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkgconfig +{ mkDerivation, fetchFromGitHub, lib, makeWrapper, pkg-config , kcoreaddons, ki18n, kwallet, mksh, pinentry-qt }: mkDerivation rec { @@ -26,7 +26,7 @@ mkDerivation rec { makeFlags = [ "KDE_VER=5" ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; # if using just kwallet, cmake will be added as a buildInput and fail the build propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ]; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index 7ec902bcb99..8d2074f9835 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkgconfig +{ stdenv, lib, fetchFromGitHub, asciidoc, cmake, docbook_xsl, pkg-config , bash-completion, openssl, curl, libxml2, libxslt }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "168jg8kjbylfgalhicn0llbykd7kdc9id2989gg0nxlgmnvzl58a"; }; - nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ]; + nativeBuildInputs = [ asciidoc cmake docbook_xsl pkg-config ]; buildInputs = [ bash-completion curl openssl libxml2 libxslt diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 126cfedd157..a2fe22dd2bd 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: +{ lib, stdenv, fetchurl, pkg-config, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcsclite libusb-compat-0_1 ]; preBuild = '' diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index 5735263206e..2222316a742 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , doxygen, perl, valgrind , curl, geoip, libxml2, lmdb, lua, pcre, yajl }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "00g2407g2679zv73q67zd50z0f1g1ij734ssv2pp77z4chn5dzib"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig doxygen ]; + nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; buildInputs = [ perl valgrind curl geoip libxml2 lmdb lua pcre yajl ]; diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index 006e89871c7..3128a787807 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libnfc }: +{ lib, stdenv, fetchurl, pkg-config, libnfc }: stdenv.mkDerivation { pname = "mfcuk"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnfc ]; meta = with lib; { diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 1d2478b6bae..ca1f4a5e4f2 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libnfc }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libnfc }: stdenv.mkDerivation rec { pname = "mfoc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libnfc ]; meta = with lib; { diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 878d47f8adf..1bbefd1342c 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkg-config , curl, apacheHttpd, pcre, apr, aprutil, libxml2 , luaSupport ? false, lua5 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0611nskd2y6yagrciqafxdn4rxbdk2v4swf45kc1sgwx2sfh34j1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ] ++ optional luaSupport lua5; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index 93c12c15828..e39be14475e 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -6,7 +6,7 @@ , boost , curl , gettext -, pkgconfig +, pkg-config , libusb1 , gnutls }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake gettext pkgconfig ]; + nativeBuildInputs = [ cmake gettext pkg-config ]; buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 1da54526a61..c3aebc782d8 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkgconfig +{ lib, stdenv, bash-completion, cmake, fetchFromGitHub, hidapi, libusb1, pkg-config , qtbase, qttranslations, qtsvg, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake - pkgconfig + pkg-config wrapQtAppsHook ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index e0a4f8a08fc..531eb6eae4a 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkgconfig, openssl, lua5_3 +{ lib, stdenv, fetchurl, fetchpatch, libpcap, pkg-config, openssl, lua5_3 , pcre, liblinear, libssh2 , graphicalSupport ? false , libX11 ? null @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { pygtk pysqlite pygobject2 pycairo ]; - nativeBuildInputs = [ pkgconfig ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ]; + nativeBuildInputs = [ pkg-config ] ++ optionals graphicalSupport [ python2.pkgs.wrapPython ]; buildInputs = [ pcre liblinear libssh2 libpcap openssl ] ++ optionals graphicalSupport (with python2.pkgs; [ python2 libX11 gtk2 ]); diff --git a/pkgs/tools/security/nmap/qt.nix b/pkgs/tools/security/nmap/qt.nix index 39026c400d0..b4e406a0035 100644 --- a/pkgs/tools/security/nmap/qt.nix +++ b/pkgs/tools/security/nmap/qt.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , cmake -, pkgconfig +, pkg-config , wrapQtAppsHook , dnsutils , nmap @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q3XfwJ4TGK4E58haN0Q0xRH4GDpKD8VZzyxHe/VwBqY="; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtscript qtwebengine ]; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index deab1b929c9..d48564ce95b 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkgconfig, which +{ lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkg-config, which , libnl, protobuf, protobufc, shadow }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1w6x8xcrs0i1y3q41gyq8z3cq9x24qablklc4jiydf855lhqn4dh"; }; - nativeBuildInputs = [ autoconf bison flex libtool pkgconfig which ]; + nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ]; buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index 53d8abc6100..d87be0c2974 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkg-config }: stdenv.mkDerivation rec { version = "0.28"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx"; }; - nativeBuildInputs = [ automake autoconf pkgconfig ]; + nativeBuildInputs = [ automake autoconf pkg-config ]; buildInputs = [ ncurses parted ]; preConfigure = "sh init.sh || :"; meta = with lib; { diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index 5fb7fadbc5c..ba49da102fb 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkgconfig, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: +{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkg-config, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: let securityDependency = @@ -26,7 +26,7 @@ in stdenv.mkDerivation { buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; - nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkgconfig ]; + nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkg-config ]; # man file generation fails when true enableParallelBuilding = false; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 8201b809d15..51e0c1f58f9 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-OjOfA1pIu8NeN+hPuow5UVMKsg0PrsLojw5h05/Qm+o="; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan libXt libxslt libiconv docbook_xml_dtd_412 diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 65446e6fc44..40736cdc86b 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libusb1, pcsclite }: let version = "3.99.5"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "tools" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libusb1 pcsclite ]; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index da8fa96d10d..1d874a16da6 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, udev, dbus, perl, python3 +{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3 , IOKit ? null }: stdenv.mkDerivation rec { @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { moveToOutput bin/pcsc-spy "$dev" ''; - nativeBuildInputs = [ pkgconfig perl ]; + nativeBuildInputs = [ pkg-config perl ]; buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ udev dbus ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index b2ef4e7e030..613388fc6a3 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus, pcsclite +{ stdenv, lib, fetchurl, makeWrapper, pkg-config, udev, dbus, pcsclite , wget, coreutils, perlPackages }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { buildInputs = [ udev dbus perlPackages.perl pcsclite ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; postInstall = '' wrapProgram $out/bin/scriptor \ diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 444dd3679f3..909bbbaed16 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkgconfig, autoreconfHook, wrapGAppsHook +{ fetchurl, mkDerivation, fetchpatch, stdenv, lib, pkg-config, autoreconfHook, wrapGAppsHook , libgpgerror, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , libcap ? null, libsecret ? null @@ -48,7 +48,7 @@ pinentryMkDerivation rec { sha256 = "0w35ypl960pczg5kp6km3dyr000m1hf0vpwwlh72jjkjza36c1v8"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ] + nativeBuildInputs = [ pkg-config autoreconfHook ] ++ concatMap(f: flavorInfo.${f}.nativeBuildInputs or []) enabledFlavors; buildInputs = [ libgpgerror libassuan libcap libsecret ] ++ concatMap(f: flavorInfo.${f}.buildInputs or []) enabledFlavors; diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix index bd8be01c697..c4c9e9929d5 100644 --- a/pkgs/tools/security/polkit-gnome/default.nix +++ b/pkgs/tools/security/polkit-gnome/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }: +{ lib, stdenv, fetchurl, polkit, gtk3, pkg-config, intltool }: stdenv.mkDerivation rec { pname = "polkit-gnome"; version = "0.105"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ polkit gtk3 ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; configureFlags = [ "--disable-introspection" ]; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index 4cc831eda39..3b1f21ac718 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, pcsclite, qt5 +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, pcsclite, qt5 , gcc-arm-embedded }: let @@ -12,7 +12,7 @@ let inherit rev sha256; }; - nativeBuildInputs = [ pkgconfig gcc-arm-embedded ]; + nativeBuildInputs = [ pkg-config gcc-arm-embedded ]; buildInputs = [ ncurses readline pcsclite qt5.qtbase ]; postPatch = '' diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 51ddad0634f..2b769ee0a15 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkgconfig +{ lib, stdenv, mkDerivation, fetchgit, fetchurl, cmake, darkhttpd, gettext, makeWrapper, pkg-config , libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase, qttranslations, qtsvg }: mkDerivation rec { @@ -17,7 +17,7 @@ mkDerivation rec { sha256 = "0llr2fj8vd097hcr1d0xmzdy4jydv0b5j5qlksbjffs22rqgal14"; }; - nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake darkhttpd gettext makeWrapper pkg-config ]; postPatch = '' substituteInPlace client/CMakeLists.txt \ diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index bd5e8866374..6ea2f45b806 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -4,7 +4,7 @@ , fetchCrate , pinentry , openssl -, pkgconfig +, pkg-config , makeWrapper , Security @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "19gznam64s17kha3accgjks5rmd9kpqqgxg3dfrk7fg5v4431007"; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper ]; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 268641cb3cb..4cdc3f6d89e 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }: +{ stdenv, lib, rustPlatform, fetchFromGitHub, pkg-config, ncurses, python3, openssl, libgpgerror, gpgme, xorg, AppKit, Security }: with rustPlatform; buildRustPackage rec { @@ -18,7 +18,7 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig gpgme python3 ]; + nativeBuildInputs = [ pkg-config gpgme python3 ]; buildInputs = [ ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 2b35ec94e6e..617224a6af3 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, libtool, autoreconfHook, pkg-config , sysfsutils , argp-standalone # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''} ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; configureFlags = [ (withFeature withGcrypt "libgcrypt") diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index 36e75094c59..7a0bb37d4a4 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchgit, autoconf, automake, pkgconfig, help2man +, fetchgit, autoconf, automake, pkg-config, help2man , openssl, libuuid, gnu-efi, libbfd }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - nativeBuildInputs = [ autoconf automake pkgconfig help2man ]; + nativeBuildInputs = [ autoconf automake pkg-config help2man ]; buildInputs = [ openssl libuuid libbfd gnu-efi ]; configurePhase = '' diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 1b59db540a2..c83a6f157c8 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libbsd, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, libbsd, pkg-config }: stdenv.mkDerivation rec { pname = "signify"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbsd ]; preInstall = '' diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix index ef2f97cfa11..7cc343b7823 100644 --- a/pkgs/tools/security/sn0int/default.nix +++ b/pkgs/tools/security/sn0int/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkgconfig +{ lib, fetchFromGitHub, rustPlatform, libsodium, libseccomp, sqlite, pkg-config }: rustPlatform.buildRustPackage rec { @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1jvaavhjyalnh10vfhrdyqg1jnl8b4a3gnp8a31bgi3mb0v466k3"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium libseccomp sqlite ]; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index 0c6699b439c..f5f733d70b9 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config , libxml2, nettle , withGTK3 ? true, gtk3 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { autoconf ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake libtool libxml2 nettle diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 81086e77483..88ea30088f5 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, zlib, openssl, ncurses, libidn, pcre, libssh, libmysqlclient, postgresql -, withGUI ? false, makeWrapper, pkgconfig, gtk2 }: +, withGUI ? false, makeWrapper, pkg-config, gtk2 }: stdenv.mkDerivation rec { pname = "thc-hydra"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace "-lcurses" "-lncurses" ''; - nativeBuildInputs = lib.optionals withGUI [ pkgconfig makeWrapper ]; + nativeBuildInputs = lib.optionals withGUI [ pkg-config makeWrapper ]; buildInputs = [ zlib openssl ncurses libidn pcre libssh libmysqlclient postgresql diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a96dae5f5ef..b4adbfe8c64 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks +{ lib, stdenv, fetchurl, pkg-config, libevent, openssl, zlib, torsocks , libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests , writeShellScript @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index e6a7621d987..6b33d1d4d59 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, lib -, pandoc, pkgconfig, makeWrapper, curl, openssl, tpm2-tss +, pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss , abrmdSupport ? true, tpm2-abrmd ? null }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0117r0zzdnblkibv81y71v3limixsw5m7g9xwf7lcx8fc8836pdv"; }; - nativeBuildInputs = [ pandoc pkgconfig makeWrapper ]; + nativeBuildInputs = [ pandoc pkg-config makeWrapper ]; buildInputs = [ curl openssl tpm2-tss ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 76a3443d076..c7a11e16f39 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, pkgconfig }: +{ lib, stdenv, fetchurl, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "trousers"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sourceRoot = "."; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; diff --git a/pkgs/tools/security/yubikey-agent/default.nix b/pkgs/tools/security/yubikey-agent/default.nix index 5860fb3a03e..d4f3e1567ca 100644 --- a/pkgs/tools/security/yubikey-agent/default.nix +++ b/pkgs/tools/security/yubikey-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkgconfig, darwin }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, libnotify, makeWrapper, pcsclite, pinentry_mac, pkg-config, darwin }: buildGoModule rec { pname = "yubikey-agent"; @@ -15,7 +15,7 @@ buildGoModule rec { lib.optional stdenv.isLinux (lib.getDev pcsclite) ++ lib.optional stdenv.isDarwin (darwin.apple_sdk.frameworks.PCSC); - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; # pull in go-piv/piv-go#75 # once go-piv/piv-go#75 is merged and released, we should diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index fdcb5ed5ce9..0e37b725db4 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libjson, json_c, gengetopt, flex, byacc, gmp +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp , libpcap }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ]; dontUseCmakeBuildDir = true; - nativeBuildInputs = [ cmake pkgconfig gengetopt flex byacc ]; + nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ]; buildInputs = [ libjson json_c gmp libpcap ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index e7d12d8a68e..f8f7bece3a5 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "zzuf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9"; }; - buildInputs = [ autoconf automake libtool pkgconfig ]; + buildInputs = [ autoconf automake libtool pkg-config ]; preConfigure = "./bootstrap"; -- cgit 1.4.1