diff options
Diffstat (limited to 'pkgs/tools/package-management')
17 files changed, 34 insertions, 34 deletions
diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 00cf7d69ecd..524f912cf04 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, cmake, autoconf, automake, libtool, makeWrapper +, pkg-config, cmake, autoconf, automake, libtool, makeWrapper , wget, xxd, desktop-file-utils, file , gnupg, glib, zlib, cairo, openssl, fuse, xz, squashfuse, inotify-tools, libarchive , squashfsTools @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { patches = [ ./nix.patch ]; nativeBuildInputs = [ - pkgconfig cmake autoconf automake libtool wget xxd + pkg-config cmake autoconf automake libtool wget xxd desktop-file-utils ]; diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index 296012cc68f..a15ec7e9c16 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig, gettext +, autoreconfHook, pkg-config, gettext , vim, glib, libxml2, ncurses, popt, screen }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoreconfHook gettext + pkg-config autoreconfHook gettext ]; buildInputs = [ diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 66b16ecc046..178103cdb38 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, cmake, perlPackages, curl, gtest +{ stdenv, lib, fetchurl, pkg-config, cmake, perlPackages, curl, gtest , gnutls, libtasn1, lzma, bzip2, lz4, zstd, libseccomp, udev , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "0gn4srqaaym85gc8nldqkv01477kdwr136an2nlpbdrsbx3y83zl"; }; - nativeBuildInputs = [ pkgconfig cmake gtest libxslt.bin ]; + nativeBuildInputs = [ pkg-config cmake gtest libxslt.bin ]; buildInputs = [ perlPackages.perl curl gnutls libtasn1 lzma bzip2 lz4 zstd libseccomp udev db dpkg diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index cc671d7329c..ed181d2484e 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, bzip2, expat, glib, curl, libxml2, python3, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { pname = "createrepo_c"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { --replace "@PYTHON_INSTALL_DIR@" "$out/${python3.sitePackages}" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ bzip2 expat glib curl libxml2 python3 rpm openssl sqlite file xz pcre bash-completion ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 1606214e951..14be0924f27 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: +{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, libxslt, getopt, gettext, nixUnstable, dysnomia, libintl, libiconv, help2man, doclifter, docbook5, dblatex, doxygen, libnixxml, autoreconfHook }: stdenv.mkDerivation { name = "disnix-0.10"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0mciqbc2h60nc0i6pd36w0m2yr96v97ybrzrqzh5f67ac1f0gqwg"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libxml2 libxslt getopt nixUnstable libintl libiconv dysnomia ]; meta = { diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 2f6e98496cf..1b9d2eaefcd 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkgconfig, getopt }: +{ lib, stdenv, fetchurl, dysnomia, disnix, socat, pkg-config, getopt }: stdenv.mkDerivation { name = "disnixos-0.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0vllm5a8d9dvz5cjiq1mmkc4r4vnljabq42ng0ml85sjn0w7xvm7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ socat dysnomia disnix getopt ]; meta = { diff --git a/pkgs/tools/package-management/disnix/dydisnix/default.nix b/pkgs/tools/package-management/disnix/dydisnix/default.nix index af7a79ad7e9..b4c3851a50f 100644 --- a/pkgs/tools/package-management/disnix/dydisnix/default.nix +++ b/pkgs/tools/package-management/disnix/dydisnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkgconfig, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool , pkg-config, glib, libxml2, libxslt, getopt, libiconv, gettext, nix, disnix, libnixxml }: stdenv.mkDerivation rec { version="2020-07-04"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-XKab2hNGtWDkIEMxE1vMvqQBTP9BvHTabBVfzpH57h0="; }; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; buildInputs = [ glib libxml2 libxslt getopt nix disnix libiconv gettext libnixxml ]; preConfigure = '' ./bootstrap diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index a18c4e55e6d..9ec5c3c13b3 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , cmake , python -, pkgconfig +, pkg-config , libxml2 , glib , openssl @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index c82a58cbf0c..07d0e9f3a9d 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, makeWrapper, openssl, curl +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, openssl, curl , nix, Security }: @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0apdr9z18p6m4lfjv8k9zv2mqc7vssd2d536zfv1pns0pdqsfw50"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ openssl curl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index c29ba19ccb7..cd0fed65079 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -10,7 +10,7 @@ let common = { lib, stdenv, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar - , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex , jq, libarchive , lowdown, mdbook @@ -39,7 +39,7 @@ common = outputs = [ "out" "dev" "man" "doc" ]; nativeBuildInputs = - [ pkgconfig ] + [ pkg-config ] ++ lib.optionals is24 [ autoreconfHook autoconf-archive @@ -172,7 +172,7 @@ common = # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = - [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; + [ perl pkg-config curl nix libsodium boost autoreconfHook autoconf-archive nlohmann_json ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" diff --git a/pkgs/tools/package-management/nixui/nixui.nix b/pkgs/tools/package-management/nixui/nixui.nix index 055fc5267c3..6f3f95714a2 100644 --- a/pkgs/tools/package-management/nixui/nixui.nix +++ b/pkgs/tools/package-management/nixui/nixui.nix @@ -14,4 +14,4 @@ in import ./node-packages.nix { inherit (pkgs) fetchurl fetchgit; inherit nodeEnv; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 4178e7d9707..c4fc804b80f 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 +{ lib, stdenv, fetchurl, pkg-config, curl, gpgme, libarchive, bzip2, lzma, attr, acl, libxml2 , autoreconfHook }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "06278gmb26b9nl8l328cc2c2mhfi0dhac65syws17kf09f2m596x"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ curl gpgme libarchive bzip2 lzma attr acl libxml2 ]; meta = with lib; { diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 05877979e9c..b62597e7e50 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, lib -, intltool, glib, pkgconfig, polkit, python3, sqlite +, intltool, glib, pkg-config, polkit, python3, sqlite , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ sqlite boost ] ++ lib.optional enableNixBackend nix; - nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; + nativeBuildInputs = [ vala intltool pkg-config autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' gtkdocize diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix index f95a37ae723..f87ce8258fa 100644 --- a/pkgs/tools/package-management/packagekit/qt.nix +++ b/pkgs/tools/package-management/packagekit/qt.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkg-config , qttools, packagekit }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ packagekit ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; meta = packagekit.meta // { description = "System to facilitate installing and updating packages - Qt"; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 980f0d1e0c9..771454cd409 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, m4, perl, libarchive, openssl, zlib, bzip2, +{ stdenv, lib, fetchurl, pkg-config, m4, perl, libarchive, openssl, zlib, bzip2, lzma, curl, runtimeShell }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; - nativeBuildInputs = [ pkgconfig m4 ]; + nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; postFixup = '' diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 419de6cc85a..18477e987a5 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchpatch -, pkgconfig, autoreconfHook +, pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages , sqlite }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cpio zlib bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix index 19fbe8ae43d..46aaf4a94d6 100644 --- a/pkgs/tools/package-management/xbps/default.nix +++ b/pkgs/tools/package-management/xbps/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }: +{ lib, stdenv, fetchFromGitHub, pkg-config, which, zlib, openssl, libarchive }: stdenv.mkDerivation rec { pname = "xbps"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0pab3xf97y4wqlyrb92zxd3cfsrbnlx6pssbw4brgwcxccw9jrhy"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [ zlib openssl libarchive ]; |