ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 04:12:44 +03:00
Code Issues Projects Releases Wiki Activity

pkgs/tools: pkgconfig -> pkg-config

Browse Source
This commit is contained in:
Ben Siraphob 2021-01-17 10:51:22 +07:00 committed by Jonathan Ringer
parent fce00d15c2
commit 76f93cc731
251 changed files with 500 additions and 500 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/archivers/snzip/default.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, autoreconfHook
, pkgconfig
, pkg-config
, snappy
}:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ snappy ];
# We don't use a release tarball so we don't have a `./configure` script to
# run. That's why we generate it.
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
meta = with lib; {
description = "A compression/decompression tool based on snappy";

4
pkgs/tools/archivers/wimlib/default.nix
View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, makeWrapper
, pkgconfig, openssl, fuse, libxml2
, pkg-config, openssl, fuse, libxml2
, cabextract ? null
, cdrkit ? null
, mtools ? null
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
version = "1.13.2";
pname = "wimlib";
nativeBuildInputs = [ pkgconfig makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
buildInputs = [ openssl fuse libxml2 ntfs3g ];
src = fetchurl {

4
pkgs/tools/archivers/xarchive/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gtk2, pkgconfig }:
{ lib, stdenv, fetchurl, gtk2, pkg-config }:
stdenv.mkDerivation rec {
version = "0.2.8-6";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0chfim7z27s00naf43a61zsngwhvim14mg1p3csbv5i3f6m50xx4";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ];
hardeningDisable = [ "format" ];

4
pkgs/tools/archivers/xarchiver/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gtk3, pkgconfig, intltool, libxslt, makeWrapper,
{ lib, stdenv, fetchFromGitHub, gtk3, pkg-config, intltool, libxslt, makeWrapper,
coreutils, zip, unzip, p7zip, unrar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1iklwgykgymrwcc5p1cdbh91v0ih1m58s3w9ndl5kyd44bwlb7px";
};
nativeBuildInputs = [ pkgconfig makeWrapper wrapGAppsHook ];
nativeBuildInputs = [ pkg-config makeWrapper wrapGAppsHook ];
buildInputs = [ gtk3 intltool libxslt ];
postFixup = ''

4
pkgs/tools/cd-dvd/brasero/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, gtk3, itstool, gst_all_1, libxml2, libnotify
{ stdenv, lib, fetchurl, pkg-config, gtk3, itstool, gst_all_1, libxml2, libnotify
, libcanberra-gtk3, intltool, dvdauthor, libburn, libisofs
, vcdimager, wrapGAppsHook, hicolor-icon-theme }:
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";
};
nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ];
nativeBuildInputs = [ pkg-config itstool intltool wrapGAppsHook ];
buildInputs = [ gtk3 libxml2 libnotify libcanberra-gtk3 libburn libisofs
hicolor-icon-theme

4
pkgs/tools/cd-dvd/cdrdao/default.nix
View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, libvorbis, libmad, pkgconfig, libao}:
{lib, stdenv, fetchurl, libvorbis, libmad, pkg-config, libao}:
stdenv.mkDerivation {
name = "cdrdao-1.2.3";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libvorbis libmad libao ];
hardeningDisable = [ "format" ];

4
pkgs/tools/cd-dvd/dvdisaster/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, gettext, which
{ lib, stdenv, fetchurl, pkg-config, gettext, which
, glib, gtk2
, enableSoftening ? true
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0f8gjnia2fxcbmhl8b3qkr5b7idl8m855dw7xw2fnmbqwvcm6k4w";
};
nativeBuildInputs = [ gettext pkgconfig which ];
nativeBuildInputs = [ gettext pkg-config which ];
buildInputs = [ glib gtk2 ];
patches = lib.optional enableSoftening [

4
pkgs/tools/cd-dvd/lsdvd/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libdvdread, pkgconfig }:
{ lib, stdenv, fetchurl, libdvdread, pkg-config }:
let
version = "0.17";
@ -12,7 +12,7 @@ stdenv.mkDerivation {
};
buildInputs = [ libdvdread ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
meta = with lib; {
homepage = "https://sourceforge.net/projects/lsdvd/";

4
pkgs/tools/misc/alarm-clock-applet/default.nix
View File

@ -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

4
pkgs/tools/misc/antimicroX/default.nix
View File

@ -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

4
pkgs/tools/misc/birdfont/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/birdfont/xmlbird.nix
View File

@ -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 ];

4
pkgs/tools/misc/blink1-tool/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/bmon/default.nix
View File

@ -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 ];

4
pkgs/tools/misc/brltty/default.nix
View File

@ -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;

4
pkgs/tools/misc/chafa/default.nix
View File

@ -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

4
pkgs/tools/misc/ckb-next/default.nix
View File

@ -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
];

4
pkgs/tools/misc/colord-gtk/default.nix
View File

@ -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

4
pkgs/tools/misc/colord/default.nix
View File

@ -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

4
pkgs/tools/misc/dbus-map/default.nix
View File

@ -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
];

4
pkgs/tools/misc/ddccontrol/default.nix
View File

@ -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

4
pkgs/tools/misc/ddcutil/default.nix
View File

@ -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

4
pkgs/tools/misc/desktop-file-utils/default.nix
View File

@ -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;

4
pkgs/tools/misc/duc/default.nix
View File

@ -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 ];

4
pkgs/tools/misc/eot-utilities/default.nix
View File

@ -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/";

4
pkgs/tools/misc/exa/default.nix
View File

@ -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 ]

4
pkgs/tools/misc/ffsend/default.nix
View File

@ -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 ];

4
pkgs/tools/misc/flashrom/default.nix
View File

@ -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; {

4
pkgs/tools/misc/fontforge/default.nix
View File

@ -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

4
pkgs/tools/misc/fwup/default.nix
View File

@ -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

4
pkgs/tools/misc/g933-utils/default.nix
View File

@ -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; {

4
pkgs/tools/misc/gbdfed/default.nix
View File

@ -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 ];

4
pkgs/tools/misc/gnokii/default.nix
View File

@ -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
];

4
pkgs/tools/misc/goaccess/default.nix
View File

@ -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

4
pkgs/tools/misc/gparted/default.nix
View File

@ -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+=(

4
pkgs/tools/misc/grub/2.0x.nix
View File

@ -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;

4
pkgs/tools/misc/gsmartcontrol/default.nix
View File

@ -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;

4
pkgs/tools/misc/hashit/default.nix
View File

@ -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
];

4
pkgs/tools/misc/hhpc/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/ideviceinstaller/default.nix
View File

@ -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";

4
pkgs/tools/misc/idevicerestore/default.nix
View File

@ -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 = [

4
pkgs/tools/misc/journaldriver/default.nix
View File

@ -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";

4
pkgs/tools/misc/ldapvi/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/ldmtool/default.nix
View File

@ -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
];

4
pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
View File

@ -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;

4
pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix
View File

@ -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;

4
pkgs/tools/misc/libbitcoin/libbitcoin-network.nix
View File

@ -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;

4
pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix
View File

@ -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 ];

4
pkgs/tools/misc/libbitcoin/libbitcoin.nix
View File

@ -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 ];

4
pkgs/tools/misc/linuxquota/default.nix
View File

@ -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; {

4
pkgs/tools/misc/man-db/default.nix
View File

@ -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 */ ];

4
pkgs/tools/misc/mc/default.nix
View File

@ -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

4
pkgs/tools/misc/mdbtools/default.nix
View File

@ -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;

2
pkgs/tools/misc/microplane/deps.nix generated
View File

@ -225,4 +225,4 @@
sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6";
};
}
]
]

4
pkgs/tools/misc/minicom/default.nix
View File

@ -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;

4
pkgs/tools/misc/mongodb-tools/default.nix
View File

@ -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

4
pkgs/tools/misc/mpdscribble/default.nix
View File

@ -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; {

4
pkgs/tools/misc/notify-desktop/default.nix
View File

@ -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

4
pkgs/tools/misc/opencorsairlink/default.nix
View File

@ -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"}" ];

4
pkgs/tools/misc/osinfo-db-tools/default.nix
View File

@ -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; {

4
pkgs/tools/misc/pal/default.nix
View File

@ -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" ];

4
pkgs/tools/misc/paps/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/parcellite/default.nix
View File

@ -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";

4
pkgs/tools/misc/pick/default.nix
View File

@ -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;

4
pkgs/tools/misc/plotinus/default.nix
View File

@ -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

4
pkgs/tools/misc/powerline-rs/default.nix
View File

@ -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";

4
pkgs/tools/misc/progress/default.nix
View File

@ -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)" ];

4
pkgs/tools/misc/pspg/default.nix
View File

@ -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"}" ];

4
pkgs/tools/misc/qjoypad/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/riemann-c-client/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/rmlint/default.nix
View File

@ -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

4
pkgs/tools/misc/rockbox-utility/default.nix
View File

@ -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 \

4
pkgs/tools/misc/rpm-ostree/default.nix
View File

@ -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

4
pkgs/tools/misc/rrdtool/default.nix
View File

@ -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 ];

4
pkgs/tools/misc/sd-mux-ctrl/default.nix
View File

@ -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 ];

4
pkgs/tools/misc/silicon/default.nix
View File

@ -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";

4
pkgs/tools/misc/slop/default.nix
View File

@ -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;

4
pkgs/tools/misc/snapper/default.nix
View File

@ -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 = [

4
pkgs/tools/misc/subberthehut/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -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

4
pkgs/tools/misc/systrayhelper/default.nix
View File

@ -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; {

4
pkgs/tools/misc/tensorman/default.nix
View File

@ -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";

4
pkgs/tools/misc/timidity/default.nix
View File

@ -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" ];

4
pkgs/tools/misc/tldr/default.nix
View File

@ -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="];

4
pkgs/tools/misc/tmate/default.nix
View File

@ -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/";

4
pkgs/tools/misc/tmux/default.nix
View File

@ -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
];

4
pkgs/tools/misc/toilet/default.nix
View File

@ -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; {

4
pkgs/tools/misc/ttfautohint/default.nix
View File

@ -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;

4
pkgs/tools/misc/ttwatch/default.nix
View File

@ -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" ];

4
pkgs/tools/misc/tty-clock/default.nix
View File

@ -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)" ];

4
pkgs/tools/misc/ultrastar-creator/default.nix
View File

@ -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; {

4
pkgs/tools/misc/ultrastar-manager/default.nix
View File

@ -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; {

4
pkgs/tools/misc/unclutter-xfixes/default.nix
View File

@ -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" ];

4
pkgs/tools/misc/urjtag/default.nix
View File

@ -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 ];

4
pkgs/tools/misc/usbmuxd/default.nix
View File

@ -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 = ''

4
pkgs/tools/misc/websocat/default.nix
View File

@ -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

4
pkgs/tools/misc/wl-clipboard/default.nix
View File

@ -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; {

4
pkgs/tools/misc/wlr-randr/default.nix
View File

@ -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; {

4
pkgs/tools/misc/wv/default.nix
View File

@ -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" ];

4
pkgs/tools/misc/xburst-tools/default.nix
View File

@ -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;

Some files were not shown because too many files have changed in this diff Show More