diff options
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
42 files changed, 86 insertions, 86 deletions
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index a71aca7935724..a1be29b01830a 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3 , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf librsvg ]; - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; + nativeBuildInputs = [ pkg-config intltool iconnamingutils gtk3 ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 15ae93075a4e3..81faf79cbb691 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, gettext, fetchurl, vala, desktop-file-utils -, meson, ninja, pkgconfig, python3, gtk3, glib, libxml2 +, meson, ninja, pkg-config, python3, gtk3, glib, libxml2 , wrapGAppsHook, itstool, gnome3 }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ]; buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index 5c741614c3952..88260f05acf11 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 +{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook, libgee }: @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; buildInputs = [ glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 8de140e33ca8a..4e7892c048f9b 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkgconfig, glib, gtk3, gnome3, python3, dconf +{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf , libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }: let @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja vala libxslt pkgconfig wrapGAppsHook + meson ninja vala libxslt pkg-config wrapGAppsHook gettext docbook_xsl libxml2 gobject-introspection python3 ]; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 0e4e349dbdbeb..8ebb5c3f64f11 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -2,7 +2,7 @@ , intltool , fetchurl , webkitgtk -, pkgconfig +, pkg-config , gtk3 , glib , file @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config libtool intltool itstool diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 9515d28520c57..9f949b60738e6 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -3,7 +3,7 @@ , ninja , gettext , fetchurl -, pkgconfig +, pkg-config , gtk3 , glib , icu @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook buildPackages.glib diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 998f4dfd9a2e0..77b8b8977d121 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , libxml2 , appstream @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { itstool meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook yelp-tools diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index a48676cc98314..def25f62f3c1c 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, pkgconfig, gnome3, python3, gobject-introspection +{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr , p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobject-introspection vala + cmake ninja pkg-config intltool python3 gperf wrapGAppsHook gobject-introspection vala ]; buildInputs = [ glib libsoup libxml2 gtk3 gnome-online-accounts diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 70c206bccf97f..36bf7b3e92c91 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }: stdenv.mkDerivation rec { pname = "gnome-backgrounds"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; meta = with lib; { platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index 2bba316ee1258..2397b9d7be90d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib +{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection , gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobject-introspection + meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 python3 ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index dffeb8896f85d..e033197b3475d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 +{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkg-config, libxml2 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gettext itstool wrapGAppsHook python3 + meson ninja pkg-config vala gettext itstool wrapGAppsHook python3 gobject-introspection # for finding vapi files ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 69d8af9a09b59..73db99f3d379e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , itstool , desktop-file-utils @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config gettext itstool desktop-file-utils diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 9c1d4760456bf..3a7e21c65f54f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -3,7 +3,7 @@ , fetchurl , evolution-data-server , fetchpatch -, pkgconfig +, pkg-config , libxslt , docbook_xsl , docbook_xml_dtd_42 @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext libxslt diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index e3628cbe2c4b8..5a78f412dc7ac 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -52,7 +52,7 @@ , networkmanagerapplet , libnma , ninja -, pkgconfig +, pkg-config , polkit , python3 , samba @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { libxslt meson ninja - pkgconfig + pkg-config python3 shared-mime-info wrapGAppsHook diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 69287c9eae063..bfe0bfe9d6157 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, gnome3, gtk3, glib +{ lib, stdenv, fetchurl, substituteAll, pkg-config, libxslt, ninja, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection + pkg-config meson ninja gettext libxslt libxml2 gobject-introspection gtk-doc docbook_xsl glib ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 8615989b9630f..bb602c8b3fa13 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt +{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , gnome3, gtk3, glib, gsettings-desktop-schemas }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool + meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 700489e4dd328..95dfd0ef282c9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread +{ lib, stdenv, gettext, fetchurl, pkg-config, udisks2, libsecret, libdvdread , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , itstool, gnome3, libxml2, gsettings-desktop-schemas , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxslt docbook_xsl + meson ninja pkg-config gettext itstool libxslt docbook_xsl wrapGAppsHook python3 libxml2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 092cdbbdce00b..83563c7d212c9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme +, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme , wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; - nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; + nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ]; buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ]; # Do not run meson-postinstall.sh diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 98675f05bb588..002ae9197b747 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -4,7 +4,7 @@ , gettext , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , gnome3 , accountsservice @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config systemd wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index e3189c27f706b..cea158205574d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, dbus, libgcrypt, pam, python2, glib, libxslt +{ lib, stdenv, fetchurl, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt , gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook , docbook_xsl, docbook_xml_dtd_43, gnome3 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook + pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook ]; configureFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index 5d9ff69a6fa6d..8411b2edecb49 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -3,7 +3,7 @@ , cairo , meson , ninja -, pkgconfig +, pkg-config , python3 , wrapGAppsHook , glib @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 4988a2d447b6e..432f7d9e2ad5b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkgconfig, libcanberra-gtk3 +{ lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils , gnome3, gsettings-desktop-schemas }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { patchShebangs build-aux/postinstall.py ''; - nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme gsettings-desktop-schemas diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index bb4a7fd68efe9..d2dca54b5ca46 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, glib, gtk3, gsettings-desktop-schemas +{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext makeWrapper + meson ninja pkg-config gettext makeWrapper xmlto libxslt docbook_xsl docbook_xml_dtd_412 python3 dbus # for DTD ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 9955eee2b3e9c..e5923e6b56abd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -4,7 +4,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , perl , gettext @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config perl gettext libxml2 diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 3f3b619cfe69f..8b882df3b0078 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_68, glib +{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, spidermonkey_68, glib , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 checkInputs = [ spidermonkey_68 ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; + nativeBuildInputs = [ meson ninja pkg-config gettext glib ]; mesonFlags = [ "-Dextension_set=all" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index c0cf9bceb671e..215e95d9ad2d1 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree +{ lib, stdenv, fetchurl, substituteAll, pkg-config, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree , glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobject-introspection, flatpak, fwupd , gtk3, gsettings-desktop-schemas, gnome-desktop, libxmlb, gnome-online-accounts , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gtk-doc, desktop-file-utils @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 + meson ninja pkg-config gettext wrapGAppsHook libxslt docbook_xml_dtd_42 docbook_xml_dtd_43 valgrind-light docbook_xsl gtk-doc desktop-file-utils gobject-introspection ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 963dbad62907a..db978f953b794 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2 +{ lib, stdenv, gettext, fetchurl, pkg-config, gtkmm3, libxml2 , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - pkgconfig gettext itstool wrapGAppsHook meson ninja python3 + pkg-config gettext itstool wrapGAppsHook meson ninja python3 ]; buildInputs = [ bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 54e2bd698d18f..b4e8db7751067 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus +{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 , libxslt, docbook-xsl-nons }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig gettext itstool which libxml2 libxslt docbook-xsl-nons + pkg-config gettext itstool which libxml2 libxslt docbook-xsl-nons vala desktop-file-utils wrapGAppsHook pcre2 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 4c9ed85fe48d7..7b42d724593a2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6496df08945e6..54fcf531c6586 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -6,7 +6,7 @@ , fetchpatch , apacheHttpd , nautilus -, pkgconfig +, pkg-config , gtk3 , glib , libxml2 @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index bbb271004ac43..aac5a43e4339a 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -3,7 +3,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , python3 , gtk3 , adwaita-icon-theme @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook unzip diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index d4baaef819f0d..65d2bbc2157a4 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkgconfig, intltool, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }: let pname = "libgnome-keyring"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ]; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 427893d2aabbe..1f4ca5d3213d8 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -2,7 +2,7 @@ , fetchpatch , substituteAll , lib, stdenv -, pkgconfig +, pkg-config , gnome3 , pantheon , gettext @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter + # required for pkg-config to detect mutter-clutter json-glib libXtst libcap_ng @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook xorgserver # for cvt command diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index bc86e9655478d..1ac0be1b19455 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -3,7 +3,7 @@ , substituteAll , runCommand , lib, stdenv -, pkgconfig +, pkg-config , gnome3 , gettext , gobject-introspection @@ -74,7 +74,7 @@ let self = stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter + # required for pkg-config to detect mutter-clutter json-glib libXtst libcap_ng @@ -86,7 +86,7 @@ let self = stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook xorgserver # for cvt command diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 25b38a5df9fc4..5ca1efe1ca329 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , libxml2 , desktop-file-utils @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 234d45f877a4c..65096c359d760 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , vala , gettext , libxml2 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala gettext libxml2 diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 96a8145ae7f43..6d28228392555 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gettext , itstool , python3 @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ninja gettext itstool - pkgconfig + pkg-config python3 wrapGAppsHook libxml2 diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 70cb81a165bec..f5e85a1f16cde 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , meson , gettext , gobject-introspection @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 082732eace6e7..a98265ff508b5 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -8,7 +8,7 @@ , clutter-gst , python3Packages , shared-mime-info -, pkgconfig +, pkg-config , gtk3 , glib , gobject-introspection @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config gettext python3Packages.python itstool diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 7aa64d0357a97..b02c7039e51d7 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , gettext , fetchurl -, pkgconfig +, pkg-config , itstool , libxml2 , libxslt @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext itstool libxml2 diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 8b27f63728039..62c5994fd4114 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gettext, fetchurl, webkitgtk, pkgconfig, gtk3, glib +{ lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib , gnome3, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "102z8khj82vdp12c3y86hhxwm1x89xpkpc5zs63c7gg21cbrwdbl"; }; - nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite libxml2 libxslt gnome3.yelp-xsl diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index b27c10447f4de..d02cb581cb8cc 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , libxml2 , gnome3 , gtk3 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gettext yelp-tools itstool |