summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorBen Siraphob <bensiraphob@gmail.com>2021-01-17 09:14:13 +0700
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-01-16 23:49:59 -0800
commitd13840759c7497cca2bb7f890ed66932a1f9c857 (patch)
treee0ae3f150a2078b6f5001a8415d0e9a7478f0886 /pkgs
parent5d566c43b4877ad32fb096e4d606b57eaa6dfe37 (diff)
pkgs/data: pkgconfig -> pkg-config
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/data/documentation/zeal/default.nix4
-rw-r--r--pkgs/data/fonts/noto-fonts/default.nix4
-rw-r--r--pkgs/data/icons/elementary-xfce-icon-theme/default.nix4
-rw-r--r--pkgs/data/icons/gnome-icon-theme/default.nix4
-rw-r--r--pkgs/data/icons/tango-icon-theme/default.nix4
-rw-r--r--pkgs/data/misc/adapta-backgrounds/default.nix4
-rw-r--r--pkgs/data/misc/media-player-info/default.nix4
-rw-r--r--pkgs/data/misc/shared-mime-info/default.nix4
-rw-r--r--pkgs/data/misc/xorg-rgb/default.nix4
-rw-r--r--pkgs/data/themes/adapta/default.nix4
-rw-r--r--pkgs/data/themes/greybird/default.nix4
-rw-r--r--pkgs/data/themes/plata/default.nix4
-rw-r--r--pkgs/data/themes/qtcurve/default.nix4
-rw-r--r--pkgs/data/themes/solarc/default.nix4
-rw-r--r--pkgs/data/themes/vertex/default.nix4
15 files changed, 30 insertions, 30 deletions
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 7543672f7d0d..a6c0b1f49185 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig
+{ lib, stdenv, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config
, qtbase, qtimageformats, qtwebengine, qtx11extras, mkDerivation
, libarchive, libXdmcp, libpthreadstubs, xcbutilkeysyms }:
@@ -22,7 +22,7 @@ mkDerivation rec {
-e 's@^project.*@project(Zeal VERSION ${version})@'
'';
- nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
+ nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
buildInputs = [
qtbase qtimageformats qtwebengine qtx11extras
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 59d1ed353f3a..d93e58854014 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -7,7 +7,7 @@
, optipng
, cairo
, python3
-, pkgconfig
+, pkg-config
, pngquant
, which
, imagemagick
@@ -131,7 +131,7 @@ in
zopfli
pngquant
which
- pkgconfig
+ pkg-config
emojiPythonEnv
];
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index adf2139d0cef..bd4e43ff5edc 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }:
stdenv.mkDerivation rec {
pname = "elementary-xfce-icon-theme";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkgconfig
+ pkg-config
gdk-pixbuf
librsvg
optipng
diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix
index b9a4fd48fb67..0e6a2fc67c43 100644
--- a/pkgs/data/icons/gnome-icon-theme/default.nix
+++ b/pkgs/data/icons/gnome-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
+{ lib, stdenv, fetchurl, pkg-config, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation rec {
pname = "gnome-icon-theme";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkgconfig
+ pkg-config
intltool
iconnamingutils
gtk2
diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix
index b69bf4d46f53..09d0875ca8a3 100644
--- a/pkgs/data/icons/tango-icon-theme/default.nix
+++ b/pkgs/data/icons/tango-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg
+{ lib, stdenv, fetchurl, intltool, pkg-config, iconnamingutils, imagemagick, librsvg
, gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
patches = [ ./rsvg-convert.patch ];
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool iconnamingutils imagemagick librsvg ];
propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ];
# still missing parent icon themes: cristalsvg
diff --git a/pkgs/data/misc/adapta-backgrounds/default.nix b/pkgs/data/misc/adapta-backgrounds/default.nix
index 029961f6c52b..6debaa9ebe22 100644
--- a/pkgs/data/misc/adapta-backgrounds/default.nix
+++ b/pkgs/data/misc/adapta-backgrounds/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib }:
stdenv.mkDerivation rec {
pname = "adapta-backgrounds";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "04hmbmzf97rsii8gpwy3wkljy5xhxmlsl34d63s6hfy05knclydj";
};
- nativeBuildInputs = [ meson ninja pkgconfig glib ];
+ nativeBuildInputs = [ meson ninja pkg-config glib ];
meta = with lib; {
description = "Wallpaper collection for adapta-project";
diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix
index 867822af39e6..56e4ace41f4d 100644
--- a/pkgs/data/misc/media-player-info/default.nix
+++ b/pkgs/data/misc/media-player-info/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, python3, udev, systemd }:
+{ lib, stdenv, fetchurl, pkg-config, python3, udev, systemd }:
let
name = "media-player-info-24";
@@ -13,7 +13,7 @@ in
};
buildInputs = [ udev systemd ];
- nativeBuildInputs = [ pkgconfig python3 ];
+ nativeBuildInputs = [ pkg-config python3 ];
postPatch = ''
patchShebangs ./tools
diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix
index 69e1e697a473..c69a9802c0c8 100644
--- a/pkgs/data/misc/shared-mime-info/default.nix
+++ b/pkgs/data/misc/shared-mime-info/default.nix
@@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
-, pkgconfig
+, pkg-config
, gettext
, perlPackages
, itstool
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
- pkgconfig
+ pkg-config
gettext
itstool
] ++ (with perlPackages; [
diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix
index c74c4b826ed0..24689d571da6 100644
--- a/pkgs/data/misc/xorg-rgb/default.nix
+++ b/pkgs/data/misc/xorg-rgb/default.nix
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, pkgconfig, xorgproto}:
+{lib, stdenv, fetchurl, pkg-config, xorgproto}:
stdenv.mkDerivation rec {
pname = "rgb";
version = "1.0.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv";
};
- nativeBuildInputs = [pkgconfig];
+ nativeBuildInputs = [pkg-config];
buildInputs = [xorgproto];
meta = {
inherit version;
diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix
index 7bbb8b6acc9e..f67d689a4bfc 100644
--- a/pkgs/data/themes/adapta/default.nix
+++ b/pkgs/data/themes/adapta/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
stdenv.mkDerivation rec {
pname = "adapta-gtk-theme";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
- pkgconfig
+ pkg-config
parallel
sassc
inkscape
diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
index 987df8deaf49..202424eeb2c4 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/pkgs/data/themes/greybird/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, sassc, gdk-pixbuf, librsvg, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "greybird";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
meson
ninja
- pkgconfig
+ pkg-config
sassc
];
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index 5c7de90b295e..69e6f0bb0d2e 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
+{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, parallel
, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine
, cinnamonSupport ? true
, gnomeFlashbackSupport ? true
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
- pkgconfig
+ pkg-config
parallel
sassc
inkscape
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index a65a24dc0b67..45a56f3355ec 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkgconfig, mkDerivation
+{ lib, fetchFromGitHub, cmake, extra-cmake-modules, pkg-config, mkDerivation
, gtk2Support ? true, gtk2
, qtbase, qtsvg, qtx11extras # Toolkit dependencies
, karchive, kconfig, kconfigwidgets, kio, frameworkintegration
@@ -30,7 +30,7 @@ mkDerivation rec {
})
];
- nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig ];
+ nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
buildInputs = [
qtbase qtsvg qtx11extras
diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix
index 62a9b1076cf0..3f6932e40a0c 100644
--- a/pkgs/data/themes/solarc/default.nix
+++ b/pkgs/data/themes/solarc/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig,
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config,
gtk-engine-murrine, gtk3
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
sha256 = "005b66whyxba3403yzykpnlkz0q4m154pxpb4jzcny3fggy9r70s";
};
- nativeBuildInputs = [ autoconf automake pkgconfig gtk3 ];
+ nativeBuildInputs = [ autoconf automake pkg-config gtk3 ];
propagatedUserEnvPkgs = [ gtk-engine-murrine gtk3 ];
diff --git a/pkgs/data/themes/vertex/default.nix b/pkgs/data/themes/vertex/default.nix
index 7e0b5d7e9cb2..d25df29013ba 100644
--- a/pkgs/data/themes/vertex/default.nix
+++ b/pkgs/data/themes/vertex/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-engine-murrine }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk-engine-murrine }:
stdenv.mkDerivation rec {
pname = "theme-vertex";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0c9mhrs95ahz37djrv176vn41ywvj26ilwmnr1h9171giv6hid98";
};
- nativeBuildInputs = [ autoreconfHook pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook pkg-config ];
propagatedUserEnvPkgs = [ gtk-engine-murrine ];