summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/graphics
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-01-17 16:17:16 +0700
committerBen Siraphob <bensiraphob@gmail.com>2021-01-17 23:27:27 +0700
commitd6aeae8f90a4935525915431e3b08ebf1b7d5bf3 (patch)
tree0376acde4a65afc15fccb505d35a9fc65fafe55c /pkgs/tools/graphics
parent979e6e67d32a934dcc39dedfd588baf6e3f7ed78 (diff)
pkgs/tools: pkgconfig -> pkg-config (2)
Diffstat (limited to 'pkgs/tools/graphics')
-rw-r--r--pkgs/tools/graphics/blockhash/default.nix4
-rw-r--r--pkgs/tools/graphics/blur-effect/default.nix4
-rw-r--r--pkgs/tools/graphics/dmtx-utils/default.nix4
-rw-r--r--pkgs/tools/graphics/editres/default.nix4
-rw-r--r--pkgs/tools/graphics/enblend-enfuse/default.nix4
-rw-r--r--pkgs/tools/graphics/exif/default.nix4
-rw-r--r--pkgs/tools/graphics/fim/default.nix4
-rw-r--r--pkgs/tools/graphics/ggobi/default.nix4
-rw-r--r--pkgs/tools/graphics/gifski/default.nix4
-rw-r--r--pkgs/tools/graphics/glmark2/default.nix4
-rw-r--r--pkgs/tools/graphics/gmic-qt/default.nix4
-rw-r--r--pkgs/tools/graphics/gnuplot/default.nix4
-rw-r--r--pkgs/tools/graphics/graphviz/base.nix4
-rw-r--r--pkgs/tools/graphics/grim/default.nix4
-rw-r--r--pkgs/tools/graphics/leela/default.nix4
-rw-r--r--pkgs/tools/graphics/logstalgia/default.nix4
-rw-r--r--pkgs/tools/graphics/maim/default.nix4
-rw-r--r--pkgs/tools/graphics/netpbm/default.nix2
-rw-r--r--pkgs/tools/graphics/nip2/default.nix4
-rw-r--r--pkgs/tools/graphics/pdf2svg/default.nix4
-rw-r--r--pkgs/tools/graphics/pdftag/default.nix4
-rw-r--r--pkgs/tools/graphics/pfstools/default.nix4
-rw-r--r--pkgs/tools/graphics/pngnq/default.nix4
-rw-r--r--pkgs/tools/graphics/pngquant/default.nix4
-rw-r--r--pkgs/tools/graphics/pstoedit/default.nix4
-rw-r--r--pkgs/tools/graphics/quirc/default.nix4
-rw-r--r--pkgs/tools/graphics/s2png/default.nix4
-rw-r--r--pkgs/tools/graphics/scanbd/default.nix4
-rw-r--r--pkgs/tools/graphics/unpaper/default.nix4
-rw-r--r--pkgs/tools/graphics/vips/default.nix4
-rw-r--r--pkgs/tools/graphics/vulkan-tools-lunarg/default.nix4
-rw-r--r--pkgs/tools/graphics/vulkan-tools/default.nix4
-rw-r--r--pkgs/tools/graphics/wdisplays/default.nix4
-rw-r--r--pkgs/tools/graphics/xcur2png/default.nix4
-rw-r--r--pkgs/tools/graphics/zbar/default.nix4
35 files changed, 69 insertions, 69 deletions
diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
index 3ea88053d9e3..a0ecdde3826c 100644
--- a/pkgs/tools/graphics/blockhash/default.nix
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, python, pkgconfig, imagemagick, wafHook }:
+{ lib, stdenv, fetchFromGitHub, python, pkg-config, imagemagick, wafHook }:
stdenv.mkDerivation rec {
pname = "blockhash";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0m7ikppl42iicgmwsb7baajmag7v0p1ab06xckifvrr0zm21bq9p";
};
- nativeBuildInputs = [ python pkgconfig wafHook ];
+ nativeBuildInputs = [ python pkg-config wafHook ];
buildInputs = [ imagemagick ];
meta = with lib; {
diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix
index 7ccda815e1ca..e393da508323 100644
--- a/pkgs/tools/graphics/blur-effect/default.nix
+++ b/pkgs/tools/graphics/blur-effect/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gdk-pixbuf, libGL, mesa }:
stdenv.mkDerivation rec {
pname = "blur-effect";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkgconfig
+ pkg-config
cmake
];
diff --git a/pkgs/tools/graphics/dmtx-utils/default.nix b/pkgs/tools/graphics/dmtx-utils/default.nix
index 36146f08dbfe..a22f0bc60d47 100644
--- a/pkgs/tools/graphics/dmtx-utils/default.nix
+++ b/pkgs/tools/graphics/dmtx-utils/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, libdmtx, pkgconfig, imagemagick}:
+{lib, stdenv, fetchurl, libdmtx, pkg-config, imagemagick}:
let
s = # Generated upstream information
rec {
@@ -9,7 +9,7 @@ let
url="mirror://sourceforge/project/libdmtx/libdmtx/0.7.4/dmtx-utils-0.7.4.tar.gz";
sha256="1di8ymlziy9856abd6rb72z0zqzmrff4r3vql0q9r5sk5ax4s417";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [
libdmtx imagemagick
];
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index 2c9eadea8bfb..3a55524dc00d 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libXt, libXaw, libXres, utilmacros }:
+{ lib, stdenv, fetchurl, pkg-config, libXt, libXaw, libXres, utilmacros }:
stdenv.mkDerivation rec {
name = "editres-1.0.7";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "10mbgijb6ac6wqb2grpy9mrazzw68jxjkxr9cbdf1111pa64yj19";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libXt libXaw libXres utilmacros ];
configureFlags = [ "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres" ];
diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix
index d071b2441672..5ca9704eee31 100644
--- a/pkgs/tools/graphics/enblend-enfuse/default.nix
+++ b/pkgs/tools/graphics/enblend-enfuse/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl
, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU, libGL, vigra
-, help2man, pkgconfig, perl, texlive }:
+, help2man, pkg-config, perl, texlive }:
stdenv.mkDerivation rec {
pname = "enblend-enfuse";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU libGL vigra ];
- nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ];
+ nativeBuildInputs = [ help2man perl pkg-config texlive.combined.scheme-small ];
preConfigure = ''
patchShebangs src/embrace
diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index 33a085724ec5..59c748111269 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libexif, popt, libintl }:
+{ lib, stdenv, fetchurl, pkg-config, libexif, popt, libintl }:
stdenv.mkDerivation rec {
name = "exif-0.6.21";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1zb9hwdl783d4vd2s2rw642hg8hd6n0mfp6lrbiqmp9jmhlq5rsr";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libexif popt libintl ];
meta = with lib; {
diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix
index 9a3163951d24..252510f80596 100644
--- a/pkgs/tools/graphics/fim/default.nix
+++ b/pkgs/tools/graphics/fim/default.nix
@@ -1,4 +1,4 @@
-{ gcc9Stdenv, fetchurl, autoconf, automake, pkgconfig, lib
+{ gcc9Stdenv, fetchurl, autoconf, automake, pkg-config, lib
, perl, flex, bison, readline, libexif
, x11Support ? true, SDL
, svgSupport ? true, inkscape
@@ -23,7 +23,7 @@ gcc9Stdenv.mkDerivation rec {
--replace /usr/bin/perl ${perl}/bin/perl
'';
- nativeBuildInputs = [ autoconf automake pkgconfig ];
+ nativeBuildInputs = [ autoconf automake pkg-config ];
buildInputs = with lib;
[ perl flex bison readline libexif ]
diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix
index bce1564946c7..4e1b851735f0 100644
--- a/pkgs/tools/graphics/ggobi/default.nix
+++ b/pkgs/tools/graphics/ggobi/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libxml2, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk2 }:
stdenv.mkDerivation rec {
version = "2.1.11";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "2c4ddc3ab71877ba184523e47b0637526e6f3701bd9afb6472e6dfc25646aed7";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 gtk2 ];
configureFlags = [ "--with-all-plugins" ];
diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix
index 38f83c076ff8..94756ee94562 100644
--- a/pkgs/tools/graphics/gifski/default.nix
+++ b/pkgs/tools/graphics/gifski/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config }:
rustPlatform.buildRustPackage rec {
pname = "gifski";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0wm139lik6w2hwg72j8hcphp0z89bbabfxjmfyqrih6akyzb0l01";
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
meta = with lib; {
description = "GIF encoder based on libimagequant (pngquant)";
diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix
index e2acd81b9b00..806b03061c74 100644
--- a/pkgs/tools/graphics/glmark2/default.nix
+++ b/pkgs/tools/graphics/glmark2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGL, libdrm,
+{ lib, stdenv, fetchFromGitHub, pkg-config, libjpeg, libpng, xorg, libX11, libGL, libdrm,
python27, wayland, udev, mesa, wafHook }:
stdenv.mkDerivation {
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
sha256 = "076l75rfl6pnp1wgiwlaihy1vg2advg1z8bi0x84kk259kldgvwn";
};
- nativeBuildInputs = [ pkgconfig wafHook ];
+ nativeBuildInputs = [ pkg-config wafHook ];
buildInputs = [
libjpeg libpng xorg.libxcb libX11 libGL libdrm python27 wayland udev mesa
];
diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix
index b7650b220809..c8e3e8012b1b 100644
--- a/pkgs/tools/graphics/gmic-qt/default.nix
+++ b/pkgs/tools/graphics/gmic-qt/default.nix
@@ -6,7 +6,7 @@
, fetchFromGitHub
, fetchFromGitLab
, cmake
-, pkgconfig
+, pkg-config
, opencv3
, openexr
, graphicsmagick
@@ -109,7 +109,7 @@ mkDerivation rec {
nativeBuildInputs = [
cmake
- pkgconfig
+ pkg-config
];
buildInputs = [
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 26dec6d42c8c..2ad99c727d97 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, texinfo
+{ lib, stdenv, fetchurl, makeWrapper, pkg-config, texinfo
, cairo, gd, libcerf, pango, readline, zlib
, withTeXLive ? false, texlive
, withLua ? false, lua
@@ -27,7 +27,7 @@ in
sha256 = "03jrqs5lvxmbbz2c4g17dn2hrxqwd3hfadk9q8wbkbkyas2h8sbb";
};
- nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools;
+ nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools;
buildInputs =
[ cairo gd libcerf pango readline zlib ]
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index 5162419e05dc..6c9a84710517 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -1,6 +1,6 @@
{ rev, sha256, version }:
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, cairo, expat, flex
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
, yacc, fetchpatch, xorg ? null, ApplicationServices ? null }:
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
inherit sha256 rev;
};
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix
index cca74cea569a..1dddd7959b0e 100644
--- a/pkgs/tools/graphics/grim/default.nix
+++ b/pkgs/tools/graphics/grim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkgconfig, scdoc, wayland-protocols }:
+{ lib, stdenv, fetchFromGitHub, cairo, libjpeg, meson, ninja, wayland, pkg-config, scdoc, wayland-protocols }:
stdenv.mkDerivation rec {
pname = "grim";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
- pkgconfig
+ pkg-config
scdoc
];
diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix
index 1915b4b919f4..cf10c92286ca 100644
--- a/pkgs/tools/graphics/leela/default.nix
+++ b/pkgs/tools/graphics/leela/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, poppler }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, poppler }:
stdenv.mkDerivation {
name = "leela-12.fe7a35a";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1k6n758r9dhjmc1pnpk6qzpg0q7pkq2hf18z3b0s2z198jpkg9s3";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ poppler ];
installFlags = [ "PREFIX=$(out)" "MANDIR=$(out)/share/man" ];
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index d4abee146b8e..8edde6e3f428 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew
+{ lib, stdenv, fetchurl, SDL2, ftgl, pkg-config, libpng, libjpeg, pcre, SDL2_image, glew
, libGLU, libGL, boost, glm, freetype }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1agwjlwzp1c86hqb1p7rmzqzhd3wpnyh8whsfq4sbx01wj0l0gzd";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU libGL boost
glm freetype ];
diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index 8ea707da749b..6cfa77c8cecf 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config
, zlib, libpng, libjpeg, libGLU, libGL, glm
, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "181mjjrjb9fs1ficcv9miqbk94v95j1yli7fjp2dj514g7nj9l3x";
};
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkg-config ];
buildInputs =
[ zlib libpng libjpeg libGLU libGL glm
libX11 libXext libXfixes libXrandr libXcomposite slop icu ];
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index d9a8321a31a2..30b69c862c35 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
echo 'CC = ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc' >> config.mk
echo 'CC_FOR_BUILD = ${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc' >> config.mk
echo 'LD_FOR_BUILD = $(CC_FOR_BUILD)' >> config.mk
- echo 'PKG_CONFIG = ${buildPackages.pkgconfig}/bin/${buildPackages.pkgconfig.targetPrefix}pkg-config' >> config.mk
+ echo 'PKG_CONFIG = ${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config' >> config.mk
echo 'RANLIB = ${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib' >> config.mk
# Use libraries from Nixpkgs
diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix
index 421735256509..ae07d0ced2db 100644
--- a/pkgs/tools/graphics/nip2/default.nix
+++ b/pkgs/tools/graphics/nip2/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome2,
+{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gnome2,
fftw, gsl, goffice, libgsf }:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
- [ pkgconfig glib libxml2 flex bison vips
+ [ pkg-config glib libxml2 flex bison vips
gnome2.gtk fftw gsl goffice libgsf
];
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix
index f96f690a1cca..c6d2eab45376 100644
--- a/pkgs/tools/graphics/pdf2svg/default.nix
+++ b/pkgs/tools/graphics/pdf2svg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, cairo, gtk2, poppler }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ cairo poppler gtk2 ];
meta = with lib; {
diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix
index 2d2fe74d7848..c10412c976ce 100644
--- a/pkgs/tools/graphics/pdftag/default.nix
+++ b/pkgs/tools/graphics/pdftag/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, meson, vala, ninja
+{ lib, stdenv, fetchFromGitHub, pkg-config, meson, vala, ninja
, gtk3, poppler, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1paj8hs27akzsivn01a30fl3zx5gfn1h89wxg2m72fd806hk0hql";
};
- nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook vala ];
+ nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook vala ];
buildInputs = [ gtk3 poppler ];
meta = with lib; {
diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix
index 8611060d0557..ded996741864 100644
--- a/pkgs/tools/graphics/pfstools/default.nix
+++ b/pkgs/tools/graphics/pfstools/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin
+{ lib, stdenv, mkDerivation, fetchurl, cmake, pkg-config, darwin
, openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat
, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm
}:
@@ -25,7 +25,7 @@ mkDerivation rec {
echo "FIND_PACKAGE_HANDLE_STANDARD_ARGS(NETPBM DEFAULT_MSG NETPBM_LIBRARY NETPBM_INCLUDE_DIR)" >> cmake/FindNETPBM.cmake
'';
- nativeBuildInputs = [ cmake pkgconfig ];
+ nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
openexr zlib imagemagick fftwFloat
fftw gsl libexif perl opencv2 qtbase netpbm
diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix
index 462dd2bf7e4a..bec86e20ce3d 100644
--- a/pkgs/tools/graphics/pngnq/default.nix
+++ b/pkgs/tools/graphics/pngnq/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libpng, zlib }:
+{ lib, stdenv, fetchurl, pkg-config, libpng, zlib }:
stdenv.mkDerivation rec {
name = "pngnq-1.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1qmnnl846agg55i7h4vmrn11lgb8kg6gvs8byqz34bdkjh5gwiy1";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpng zlib ];
patchPhase = ''
diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix
index 64e6077062e2..b3b1773faf15 100644
--- a/pkgs/tools/graphics/pngquant/default.nix
+++ b/pkgs/tools/graphics/pngquant/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, libpng, zlib, lcms2 }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, zlib, lcms2 }:
stdenv.mkDerivation rec {
pname = "pngquant";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
preConfigure = "patchShebangs .";
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libpng zlib lcms2 ];
meta = with lib; {
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index 47c3bc25b2e8..57e16a4925a7 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, darwin, lib
+{ stdenv, fetchurl, pkg-config, darwin, lib
, zlib, ghostscript, imagemagick, plotutils, gd
, libjpeg, libwebp, libiconv
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
patches = [ ./pstoedit-gs-9.22-compat.patch ];
outputs = [ "out" "dev" ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib ghostscript imagemagick plotutils gd libjpeg libwebp ]
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
libiconv ApplicationServices
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix
index 6872fb232f97..bfa9bb36ce76 100644
--- a/pkgs/tools/graphics/quirc/default.nix
+++ b/pkgs/tools/graphics/quirc/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkgconfig}:
+{lib, stdenv, fetchgit, SDL_gfx, SDL, libjpeg, libpng, pkg-config}:
let
s =
rec {
@@ -13,7 +13,7 @@ let
in
stdenv.mkDerivation {
inherit (s) name version;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [
SDL SDL_gfx libjpeg libpng
];
diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix
index 49a27c1e9e97..c11248809440 100644
--- a/pkgs/tools/graphics/s2png/default.nix
+++ b/pkgs/tools/graphics/s2png/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
+{ lib, stdenv, fetchFromGitHub, diffutils, gd, pkg-config }:
stdenv.mkDerivation rec {
pname = "s2png";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6";
};
- buildInputs = [ diffutils gd pkgconfig ];
+ buildInputs = [ diffutils gd pkg-config ];
installFlags = [ "prefix=" "DESTDIR=$(out)" ];
meta = {
diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
index 0ad03e23b391..2aec9be214e7 100644
--- a/pkgs/tools/graphics/scanbd/default.nix
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig
+{ lib, stdenv, fetchurl, pkg-config
, dbus, libconfuse, libjpeg, sane-backends, systemd }:
stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
url = "mirror://sourceforge/scanbd/${pname}-${version}.tgz";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus libconfuse libjpeg sane-backends systemd ];
configureFlags = [
diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix
index a42f8bb45ee5..dd6ecb473e97 100644
--- a/pkgs/tools/graphics/unpaper/default.nix
+++ b/pkgs/tools/graphics/unpaper/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libav, libxslt }:
+{ lib, stdenv, fetchurl, pkg-config, libav, libxslt }:
stdenv.mkDerivation rec {
pname = "unpaper";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0c5rbkxbmy9k8vxjh4cv0bgnqd3wqc99yzw215vkyjslvbsq8z13";
};
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libav libxslt ];
meta = with lib; {
diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 1a64820950c1..9b29e114b887 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -1,5 +1,5 @@
{ lib, stdenv
-, pkgconfig
+, pkg-config
, glib
, libxml2
<