diff options
73 files changed, 154 insertions, 154 deletions
diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 6f13414701a9..085ad7902f5d 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, alsaLib, cmake, pkg-config, glib , tracingSupport ? true, logToStderr ? true }: let oz = x: if x then "1" else "0"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ alsaLib glib ]; diff --git a/pkgs/misc/apulse/pressureaudio.nix b/pkgs/misc/apulse/pressureaudio.nix index 710712fe5084..c69fcbc60150 100644 --- a/pkgs/misc/apulse/pressureaudio.nix +++ b/pkgs/misc/apulse/pressureaudio.nix @@ -1,11 +1,11 @@ -{ stdenv, apulse, libpulseaudio, pkgconfig, intltool, autoreconfHook }: +{ stdenv, apulse, libpulseaudio, pkg-config, intltool, autoreconfHook }: stdenv.mkDerivation { name = "libpressureaudio-${apulse.version}"; src = libpulseaudio.src; - nativeBuildInputs = [ pkgconfig intltool autoreconfHook ]; + nativeBuildInputs = [ pkg-config intltool autoreconfHook ]; dontConfigure = true; diff --git a/pkgs/misc/barebox/default.nix b/pkgs/misc/barebox/default.nix index 78d4228abb3b..cb77a607e016 100644 --- a/pkgs/misc/barebox/default.nix +++ b/pkgs/misc/barebox/default.nix @@ -7,7 +7,7 @@ , libusb1 , lzop , openssl -, pkgconfig +, pkg-config , buildPackages }: @@ -38,7 +38,7 @@ let openssl libusb1 lzop - pkgconfig + pkg-config ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 3be5bd7711fa..f5edc7293407 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, polkit, cups, fetchpatch }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, polkit, cups, fetchpatch }: stdenv.mkDerivation rec { version = "0.2.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a52jw6rm7lr5nbyksiia0rn7sasyb5cjqcb95z1wxm2yprgi6lm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ glib polkit cups ]; patches = [ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index ebab134a4ff6..0d740e071e11 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , removeReferencesTo , zlib , libjpeg @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { --replace 'cupsFileFind("cat", "/bin' 'cupsFileFind("cat", "${coreutils}/bin' ''; - nativeBuildInputs = [ pkgconfig removeReferencesTo ]; + nativeBuildInputs = [ pkg-config removeReferencesTo ]; buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus ] diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 7477c5aa78b9..8b1e7fe8fc70 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig +{ lib, stdenv, fetchurl, pkg-config, cups, poppler, poppler_utils, fontconfig , libjpeg, libpng, perl, ijs, qpdf, dbus, avahi , makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which, ghostscript , mupdf @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "1kv25011iyzvd33n5zmmn1z2p6pzk26hmmw6qvjjnx8p3sp7raqn"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ cups poppler poppler_utils fontconfig libjpeg libpng perl diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index 407eef06773e..ae8749f0326b 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -3,7 +3,7 @@ , fetchpatch , makeWrapper , symlinkJoin -, pkgconfig +, pkg-config , libtool , gtk2 , libxml2 @@ -295,7 +295,7 @@ stdenv.mkDerivation rec { sha256 = "1ma76jj0k3bz0fy06fiyl4di4y77rcryb0mwjmzs5ms2vq9rjysr"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libxml2 diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index eae437b0a4dd..db1da676a515 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchurl, pkgconfig, perl, cups, dbus, enscript }: +{ lib, stdenv, fetchpatch, fetchurl, pkg-config, perl, cups, dbus, enscript }: stdenv.mkDerivation rec { name = "foomatic-filters-4.0.17"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1qrkgbm5jay2r7sh9qbyf0aiyrsl1mdc844hxf7fhw95a0zfbqm2"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl cups dbus enscript ]; patches = [ diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 5957f30327fa..9cd76c11ccea 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -1,5 +1,5 @@ # this package was called gimp-print in the past -{ stdenv, lib, fetchurl, makeWrapper, pkgconfig +{ stdenv, lib, fetchurl, makeWrapper, pkg-config , ijs, zlib , gimp2Support ? false, gimp , cupsSupport ? true, cups, libusb-compat-0_1, perl @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0s0b14hjwvbxksq7af5v8z9g2rfqv9jdmxd9d81m57f5mh6rad0p"; }; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 128a5e39df7d..37609a66c944 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net-snmp, openssl, nettools , bash, coreutils, util-linux @@ -60,7 +60,7 @@ python2Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; pythonPath = with python2Packages; [ diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index 9622382e1214..c62161c96f80 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools @@ -66,7 +66,7 @@ python2Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; pythonPath = with python2Packages; [ diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index ed0d5183347d..6a7eb35ae52b 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll -, pkgconfig +, pkg-config , cups, zlib, libjpeg, libusb1, python3Packages, sane-backends , dbus, file, ghostscript, usbutils , net-snmp, openssl, perl, nettools, avahi @@ -69,7 +69,7 @@ python3Packages.buildPythonApplication { ]; nativeBuildInputs = [ - pkgconfig + pkg-config removeReferencesTo ] ++ lib.optional withQt5 qt5.wrapQtAppsHook; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index 82678eec1642..e2894802839e 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, sconsPackages, libX11, pkgconfig +{ lib, stdenv, fetchurl, sconsPackages, libX11, pkg-config , libusb1, boost, glib, dbus-glib }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkgconfig sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config sconsPackages.scons_3_1_2 ]; buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index a9e3d42ef9f2..8fafd1b6ebcc 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, udev, ncurses, pkgconfig, fetchurl, bluez }: +{ lib, stdenv, udev, ncurses, pkg-config, fetchurl, bluez }: stdenv.mkDerivation rec { name = "xwiimote-2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1g9cbhblll47l300zr999xr51x2g98y49l222f77fhswd12kjzhd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ncurses bluez ]; configureFlags = [ "--with-doxygen=no" ]; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 1550f71fb40a..92c42a1d3943 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg_3, fontconfig, freetype, libarchive, libjpeg -, libGLU, libGL, openal, pkgconfig, sfml, lib, stdenv, zlib +, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "16p369j0hanm0l2fiy6h9d9pn0f3qblcy9l39all6h7rfxnhp9ii"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patchPhase = '' sed -i "s|prefix=/usr/local|prefix=$out|" Makefile diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index c56a63b063bb..eba646e2f20f 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig, SDL2, glew, xcftools, python, pillow, makeWrapper }: +{ lib, stdenv, fetchurl, fetchFromGitHub, pkg-config, SDL2, glew, xcftools, python, pillow, makeWrapper }: let vasm = @@ -25,7 +25,7 @@ stdenv.mkDerivation { url = "https://www.retrodev.com/repos/blastem/archive/3d48cb0c28be.tar.gz"; sha256 = "07wzbmzp0y8mh59jxg81q17gqagz3psxigxh8dmzsipgg68y6a8r"; }; - buildInputs = [ pkgconfig SDL2 glew xcftools python pillow vasm makeWrapper ]; + buildInputs = [ pkg-config SDL2 glew xcftools python pillow vasm makeWrapper ]; preBuild = '' patchShebangs img2tiles.py ''; diff --git a/pkgs/misc/emulators/caprice32/default.nix b/pkgs/misc/emulators/caprice32/default.nix index 69002d00f80a..3e20ba616423 100644 --- a/pkgs/misc/emulators/caprice32/default.nix +++ b/pkgs/misc/emulators/caprice32/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, desktop-file-utils, libpng -, pkgconfig, SDL, freetype, zlib }: +, pkg-config, SDL, freetype, zlib }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0hng5krwgc1h9bz1xlkp2hwnvas965nd7sb3z9mb2m6x9ghxlacz"; }; - nativeBuildInputs = [ desktop-file-utils pkgconfig ]; + nativeBuildInputs = [ desktop-file-utils pkg-config ]; buildInputs = [ libpng SDL freetype zlib ]; makeFlags = [ diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index 702a46f49aae..6db1089a37f5 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -1,5 +1,5 @@ { pkgName, version, pkgSha256 }: -{ lib, stdenv, fetchurl, cmake, pkgconfig, buildInputs, drvParams ? {} }: +{ lib, stdenv, fetchurl, cmake, pkg-config, buildInputs, drvParams ? {} }: let name = "${pkgName}-${version}"; in stdenv.mkDerivation ({ inherit name buildInputs; @@ -7,7 +7,7 @@ in stdenv.mkDerivation ({ url = "mirror://sourceforge/cdemu/${name}.tar.bz2"; sha256 = pkgSha256; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; setSourceRoot = '' mkdir build cd build diff --git a/pkgs/misc/emulators/cdemu/libmirage.nix b/pkgs/misc/emulators/cdemu/libmirage.nix index e824e19347a6..0b8090ce41d2 100644 --- a/pkgs/misc/emulators/cdemu/libmirage.nix +++ b/pkgs/misc/emulators/cdemu/libmirage.nix @@ -1,4 +1,4 @@ -{ callPackage, gobject-introspection, cmake, pkgconfig +{ callPackage, gobject-introspection, cmake, pkg-config , glib, libsndfile, zlib, bzip2, lzma, libsamplerate, intltool , pcre, util-linux, libselinux, libsepol }: @@ -12,7 +12,7 @@ in callPackage pkg { drvParams = { PKG_CONFIG_GOBJEC |