diff options
Diffstat (limited to 'pkgs/applications')
369 files changed, 753 insertions, 753 deletions
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix index 43f5bcd495a..f595e211dc2 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, linkFarm, lightdm-enso-os-greeter +{ lib, stdenv, fetchgit, pkg-config, linkFarm, lightdm-enso-os-greeter , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs , gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk, wrapGAppsHook, librsvg }: @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index 363e0503c2d..d1cd2e7d3e4 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkgconfig, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: +{ lib, stdenv, linkFarm, lightdm-mini-greeter, fetchFromGitHub, autoreconfHook, pkg-config, lightdm, gtk3, glib, gdk-pixbuf, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { pname = "lightdm-mini-greeter"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "10hga7pmfyjdvj4xwm3djwrhk50brcpycj3p3c57pa0vnx4ill3s"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib gdk-pixbuf librsvg ]; configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 29dece3e5cf..5c2a6d7c59b 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkgconfig, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ lightdm gtk3 glib ]; postUnpack = if conf != "" then '' diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index ad74cbfb703..6a96f560ddc 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -4,7 +4,7 @@ , substituteAll , plymouth , pam -, pkgconfig +, pkg-config , autoconf , automake , libtool @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { intltool itstool libtool - pkgconfig + pkg-config vala ]; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 6acb05478d8..90f7a03d0dd 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -2,7 +2,7 @@ , lightdm_gtk_greeter , fetchurl , lightdm -, pkgconfig +, pkg-config , intltool , linkFarm , wrapGAppsHook @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"; }; - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; buildInputs = [ lightdm exo librsvg hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index fd02536589f..f43d3ca9be3 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub -, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs +, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd }: @@ -27,7 +27,7 @@ in mkDerivation { sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index a6c18e7d3d4..62cba4a5b73 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, ncurses, readline, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, readline, autoreconfHook }: stdenv.mkDerivation rec { name = "abook-0.6.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ ncurses readline ]; meta = { diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index 20ee9a25494..d0db2b12dfd 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -4,7 +4,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , gettext @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index bc31b844f18..37a1cee79a6 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkgconfig, wordnet }: +{ lib, stdenv, autoreconfHook, fetchurl, dbus-glib, gtk2, pkg-config, wordnet }: stdenv.mkDerivation { pname = "artha"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus-glib gtk2 wordnet ]; patches = [ diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index d77c5486f15..dd5dbde5286 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkgconfig, CoreAudio +{ config, lib, stdenv, fetchurl, pkg-config, CoreAudio , enableAlsa ? true, alsaLib ? null , enableLibao ? true, libao ? null , enableLame ? config.sox.enableLame or false, lame ? null @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; # configure.ac uses pkg-config only to locate libopusfile - nativeBuildInputs = optional enableOpusfile pkgconfig; + nativeBuildInputs = optional enableOpusfile pkg-config; buildInputs = optional (enableAlsa && stdenv.isLinux) alsaLib ++ diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix index e4305118b57..82e7c1bb21b 100644 --- a/pkgs/applications/misc/ausweisapp2/default.nix +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets , qtquickcontrols2, qtgraphicaleffects }: mkDerivation rec { @@ -12,7 +12,7 @@ mkDerivation rec { sha256 = "00isb8xcbm419nvxx2ri0n8x5d403733h2whjqjcd3hmpx3x4q1h"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index ca38498edb8..8de0ceeae65 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cairo, libxkbcommon -, pango, fribidi, harfbuzz, pcre, pkgconfig +, pango, fribidi, harfbuzz, pcre, pkg-config , ncursesSupport ? true, ncurses ? null , waylandSupport ? true, wayland ? null, wayland-protocols ? null , x11Support ? true, xlibs ? null, xorg ? null @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5"; }; - nativeBuildInputs = [ pkgconfig pcre ]; + nativeBuildInputs = [ pkg-config pcre ]; makeFlags = ["PREFIX=$(out)"]; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index c004a65ef83..3213ed9edf0 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +{ lib, mkDerivation, stdenv, fetchurl, cmake, pkg-config, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "1s5bvmwbz1gyp3ml8sghpc00h8nhdvx2iyq96iri30kwx1y1jy6i"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ sword boost clucene_core qtbase qttools qtsvg qtwebkit diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index df12d2b9f8f..ce8db160a75 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , cmake - , pkgconfig + , pkg-config , qtbase , qttools , qtx11extras @@ -26,7 +26,7 @@ mkDerivation rec { ./fix-qttranslations-path.diff ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qttools qtx11extras ]; diff --git a/pkgs/applications/misc/blogc/default.nix b/pkgs/applications/misc/blogc/default.nix index 57be731a121..c74718c52fb 100644 --- a/pkgs/applications/misc/blogc/default.nix +++ b/pkgs/applications/misc/blogc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, ronn, git, cmocka }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, ronn, git, cmocka }: stdenv.mkDerivation rec { pname = "blogc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hx0gpvmv7rd910czafvmcpxabbvfmvdyxk4d1mckmblx8prb807"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ronn git cmocka ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 8ea1dba54ed..d838cd4e859 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -2,7 +2,7 @@ , mkDerivation , fetchurl , poppler_utils -, pkgconfig +, pkg-config , libpng , imagemagick , libjpeg @@ -55,7 +55,7 @@ mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig qmake removeReferencesTo ]; + nativeBuildInputs = [ pkg-config qmake removeReferencesTo ]; CALIBRE_PY3_PORT = builtins.toString pythonPackages.isPy3k; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index c565a1bf994..1d5baf9f6b3 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, gtk3, pcsclite, lua5_2, curl, readline }: let version = "0.8.4"; @@ -14,7 +14,7 @@ in sha256 = "1ighpl7nvcvwnsd6r5h5n9p95kclwrq99hq7bry7s53yr57l6588"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib gtk3 pcsclite lua5_2 curl readline ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/cataract/build.nix b/pkgs/applications/misc/cataract/build.nix index 3347321d71d..f894dc91bd8 100644 --- a/pkgs/applications/misc/cataract/build.nix +++ b/pkgs/applications/misc/cataract/build.nix @@ -2,7 +2,7 @@ , fetchgit , autoreconfHook , glib -, pkgconfig +, pkg-config , libxml2 , exiv2 , imagemagick @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit sha256 rev; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ glib libxml2 exiv2 imagemagick ]; prePatch = '' diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index e77958b724d..482bec9d054 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, libnotify, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gettext, glib, gtk3, libnotify, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cbatticon"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0ivm2dzhsa9ir25ry418r2qg2llby9j7a6m3arbvq5c3kaj8m9jr"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ glib gtk3 libnotify ]; diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix index e1a57bb5300..fb5d9aed959 100644 --- a/pkgs/applications/misc/chewing-editor/default.nix +++ b/pkgs/applications/misc/chewing-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, libchewing, qtbase +{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, libchewing, qtbase , qttools }: mkDerivation rec { @@ -14,7 +14,7 @@ mkDerivation rec { doCheck = true; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libchewing qtbase qttools ]; meta = with lib; { diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index ccf7da70f6e..eab1185edd8 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , gettext @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index e1f019ffa45..51c61ca28e7 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, dbus, cmake, pkgconfig +, dbus, cmake, pkg-config , glib, udev, polkit, libmodule , pcre, libXdmcp, util-linux, libpthreadstubs , enableDdc ? true, ddcutil @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus cmake - pkgconfig + pkg-config ]; buildInputs = with lib; [ diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index 2502459af10..6ef2e886a19 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, dbus, cmake, pkgconfig, bash-completion +, dbus, cmake, pkg-config, bash-completion , gsl, popt, clightd, systemd, libconfig, libmodule , withGeoclue ? true, geoclue2 , withUpower ? true, upower }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dbus cmake - pkgconfig + pkg-config bash-completion ]; diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index 244770e138f..80e4982fc8a 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, rustfmt, xorg -, pkgconfig, llvmPackages, clang, protobuf, python3 }: +, pkg-config, llvmPackages, clang, protobuf, python3 }: rustPlatform.buildRustPackage rec { pname = "clipcat"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ - pkgconfig + pkg-config clang llvmPackages.libclang diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 692622df8ea..630ee3c3683 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, fetchpatch, lib, stdenv -, autoreconfHook, intltool, pkgconfig +, autoreconfHook, intltool, pkg-config , gtk3, libayatana-appindicator, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { intltoolize --copy --force --automake ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook autoreconfHook intltool ]; configureFlags = [ "--with-gtk3" "--enable-appindicator=yes" ]; buildInputs = [ gtk3 libayatana-appindicator ]; diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index a14aad7a0fc..d0ef6f05aeb 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gtk3, ncurses , libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "191zkkswlbbsw492yygc3idf7wh3bxs97drrqvqqw0mqvrzykxm3"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook nasm makeWrapper ]; buildInputs = [ gtk3 ncurses libcpuid pciutils procps ]; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 70fb38d17c4..2d3c28b2d71 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, glib, gtk, lua, libwnck3 }: +{ lib, stdenv, fetchurl, intltool, pkg-config, glib, gtk, lua, libwnck3 }: stdenv.mkDerivation rec { pname = "devilspie2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ glib gtk lua libwnck3 ]; installPhase = '' diff --git a/pkgs/applications/misc/diff-pdf/default.nix b/pkgs/applications/misc/diff-pdf/default.nix index 471755c6392..f5e5dccd0f3 100644 --- a/pkgs/applications/misc/diff-pdf/default.nix +++ b/pkgs/applications/misc/diff-pdf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, cairo, poppler, wxGTK ? null, wxmac ? null, darwin ? null }: let wxInputs = @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1y5ji4c4m69vzs0z051fkhfdrjnyxb6kzac5flhdkfb2hgp1jnxl"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ autoconf automake pkg-config ]; buildInputs = [ cairo poppler ] ++ wxInputs; preConfigure = "./bootstrap"; diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index 0c731aca713..ea78924574f 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -10,7 +10,7 @@ , udev , libusb1 , makeWrapper -, pkgconfig +, pkg-config , qtbase , qttools , qtwebsockets @@ -63,7 +63,7 @@ in mkDerivation rec { curl git makeWrapper - pkgconfig + pkg-config qttools ]; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index f193ae4c518..48ea1a0296c 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkgconfig, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: +{ lib, stdenv, mkDerivation, cmake, fetchFromBitbucket, pkg-config, qtbase, qttools, qtmultimedia, zlib, bzip2, xxd }: mkDerivation { pname = "doomseeker"; @@ -13,7 +13,7 @@ mkDerivation { patches = [ ./fix_paths.patch ./qt_build_fix.patch ]; - nativeBuildInputs = [ cmake qttools pkgconfig xxd ]; + nativeBuildInputs = [ cmake qttools pkg-config xxd ]; buildInputs = [ qtbase qtmultimedia zlib bzip2 ]; hardeningDisable = lib.optional stdenv.isDarwin "format"; diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix index a906669e7c6..eed07a2356e 100644 --- a/pkgs/applications/misc/dunst/default.nix +++ b/pkgs/applications/misc/dunst/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, makeWrapper -, pkgconfig, which, perl, libXrandr +, pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c"; }; - nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ]; + nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; buildInputs = [ cairo dbus gdk-pixbuf glib libX11 libXScrnSaver diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 806d960222d..d411ce7ae81 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig, +{ lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "10zxih7gmyhq0az1mnsw2x563l4bbwcns794s4png8rf4d6hjszm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ]; diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 8a96cddaff2..a3919648f74 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -8,7 +8,7 @@ , getent , libcap , gettext -, pkgconfig +, pkg-config , udev , eudev , libxslt @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meson ninja m4 - pkgconfig + pkg-config gperf getent libcap diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 90884af9fdf..9eea30e74f8 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk2, poppler }: stdenv.mkDerivation rec { pname = "epdfview"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0ibyb60a0b4n34bsjgvhdw8yf24463ky0hpmf6a2jjqsbm5g4v64"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 poppler ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix index 0de4ad9e21f..de47efc07ef 100644 --- a/pkgs/applications/misc/et/default.nix +++ b/pkgs/applications/misc/et/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "et"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libnotify gdk-pixbuf ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix index 3406fc572c7..84fae703a0c 100644 --- a/pkgs/applications/misc/evtest/default.nix +++ b/pkgs/applications/misc/evtest/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, libxml2 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, libxml2 }: stdenv.mkDerivation rec { pname = "evtest"; version = "1.34"; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxml2 ]; src = fetchgit { diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index e56f60624c8..c3e9218b588 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkgconfig, wxGTK30, glib, pcre, m4, bash, +{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, pkg-config, wxGTK30, glib, pcre, m4, bash, xdg_utils, gvfs, zip, unzip, gzip, bzip2, gnutar, p7zip, xz, imagemagick, darwin }: let @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1ssd3hwz4b7vl4r858d9whl61cn23pgcamcjmvfa6ysf4x2b7sgi"; }; - nativeBuildInputs = [ cmake pkgconfig m4 makeWrapper imagemagick ]; + nativeBuildInputs = [ cmake pkg-config m4 makeWrapper imagemagick ]; buildInputs = [ wxGTK30 glib pcre ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 35a50dd10a3..c2347d5fbb8 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config , bzip2, curl, expat, fribidi, libunibreak, sqlite, zlib , uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" , uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" @@ -50,7 +50,7 @@ stdenv.mkDerivation { --replace -llinebreak -lunibreak ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bzip2 curl expat fribidi libunibreak sqlite zlib diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 55d47459aed..992b6278082 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkgconfig, gtk2, keybinder, fetchFromGitLab }: +{ lib, stdenv, pkg-config, gtk2, keybinder, fetchFromGitLab }: stdenv.mkDerivation { name = "fehlstart-9f4342d7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; patches = [ ./use-nix-profiles.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 keybinder ]; preConfigure = '' diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 1a4b38a1cad..52ba2927fd4 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, autoconf, automake, gettext +{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext , fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 8b8fc09f7d3..3efef455313 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3, - pkgconfig, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools, + pkg-config, libxml2, json-glib , sqlite, itstool, librsvg, yelp-tools, vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gettext diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index 71479c4ac3e..26c6a8cbc70 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , substituteAll @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index 5ab21ad98b9..a965c615dfd 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook -, libtool, pkgconfig, gtk2, libGLU, file +, libtool, pkg-config, gtk2, libGLU, file }: let @@ -10,7 +10,7 @@ let url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pl2vdj6l64j864ilhkq1bcggb3hrlxjwk5m029i7xfjfxc587lf"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libGLU ]; hardeningDisable = [ "format" ]; }; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { sed -i 's/AM_GNU_GETTEXT/AM_GNU_GETTEXT([external])/' configure.in ''; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; buildInputs = [ file gtk2 libGLU gtkglarea ]; meta = with lib; { diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 80ec6f82571..2e1afa8053b 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libuuid +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libuuid , sane-backends, podofo, libjpeg, djvulibre, libxmlxx3, libzip, tesseract , intltool, poppler, json-glib , ninja @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja intltool - pkgconfig + pkg-config pythonEnv # Gtk specific diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index 6d7989412d4..287a2fca363 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook, intltool -, gtk, pkgconfig, flex }: +, gtk, pkg-config, flex }: stdenv.mkDerivation rec { pname = "galculator"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0q0hb62f266709ncyq96bpx4a40a1i6dc5869byvd7x285sx1c2w"; }; - nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config ]; buildInputs = [ gtk flex ]; meta = with lib; { diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index 841c629dadf..0a6796a9b07 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, python, pkgconfig, cmake, bluez, libusb1, curl +{ lib, stdenv, fetchFromGitHub, python, pkg-config, cmake, bluez, libusb1, curl , libiconv, gettext, sqlite , dbiSupport ? false, libdbi ? null, libdbiDrivers ? null , postgresSupport ? false, postgresql ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ ./bashcomp-dir.patch ./systemd.patch ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ python bluez libusb1 curl gettext sqlite libiconv ] ++ optionals dbiSupport [ libdbi libdbiDrivers ] diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index 7fdb62e5bed..c2c3a69140b 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: +{ lib, stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkg-config, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { @@ -6,7 +6,7 @@ stdenv.mkDerivation { sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; }; sourceRoot = "GarminPlugin-0.3.26/src"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 4c61a4dad51..f8ebd8aed7e 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, check, dbus, xvfb_run, glib, gtk, gettext, libiconv, json_c, libintl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1n3i960b458172mc3pkq7m9dn5qxry6fms3c3k06v27cjp5whsyf"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext check dbus xvfb_run ]; + nativeBuildInputs = [ meson ninja pkg-config gettext check dbus xvfb_run ]; buildInputs = [ libintl libiconv json_c ]; propagatedBuildInputs = [ glib gtk ]; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index 4d2fc15934b..2cc20b424b1 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE, which +{ lib, fetchurl, stdenv, gettext, pkg-config, glib, gtk2, libX11, libSM, libICE, which , IOKit ? null }: with lib; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"; }; - nativeBuildInputs = [ pkgconfig which ]; + nativeBuildInputs = [ pkg-config which ]; buildInputs = [gettext glib gtk2 libX11 libSM libICE] ++ optionals stdenv.isDarwin [ IOKit ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 973b0ce288d..9d8ce3cc480 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool gtk-doc wrapGAppsHook + pkg-config intltool gtk-doc wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index bda4b1d75f0..47d56288ed2 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, pkgconfig +, pkg-config , autoconf , automake , libtool @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config autoconf automake libtool diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index b3ef510739b..bd99adf9435 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, popt }: +{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, popt }: let version = "0.9.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 popt ]; doCheck = true; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index 0c9f20b2092..1479fe7bc7d 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libmtp, libid3tag, flac, libvorbis, gtk3 +{ lib, stdenv, fetchurl, pkg-config, libmtp, libid3tag, flac, libvorbis, gtk3 , gsettings-desktop-schemas, wrapGAppsHook }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "04q6byyq002fhzkc2rkkahwh5b6272xakaj4m3vwm8la8jf0r0ss"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ libmtp libid3tag flac libvorbis gtk3 gsettings-desktop-schemas ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix index 88be6b22f28..30d3b57003d 100644 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -11,7 +11,7 @@ , libxmlb , meson , ninja -, pkgconfig +, pkg-config , systemd , help2man , wrapGAppsHook @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { help2man meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 29078ca773d..89a967d718b 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -11,7 +11,7 @@ , libgudev , meson , ninja -, pkgconfig +, pkg-config , wrapGAppsHook , polkit , udisks @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gettext meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index d67bcdb867d..168d5b9fb5c 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , gnome3 , desktop-file-utils , gettext @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils gettext itstool diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index e40c6866729..fee4ba655c3 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -2,7 +2,7 @@ , fetchurl , meson , ninja -, pkgconfig +, pkg-config , vala , gettext , libxml2 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 63b36e2dec4..307ef57c625 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkgconfig +{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , withCC ? true, opencc @@ -30,7 +30,7 @@ mkDerivation rec { --replace "hunspell-1.6.1" "hunspell-${lib.versions.majorMinor hunspell.version}" ''; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 4d55129193f..854fec8642a 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : +{ lib, stdenv, fetchsvn, libxml2, gtk2, curl, pkg-config } : let version = "31801"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ libxml2 gtk2 curl ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 6bda23aebe0..63bba909b6d 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: +{ lib, stdenv, fetchurl, intltool, pkg-config, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { name = "gpa-0.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1cbpc45f8qbdkd62p12s3q2rdq6fa5xdzwmcwd3xrj55bzkspnwm"; }; - nativeBuildInputs = [ intltool pkgconfig ]; + nativeBuildInputs = [ intltool pkg-config ]; buildInputs = [ gtk2 gpgme libgpgerror libassuan ]; meta = with lib; { diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 409aaded4b6..5635aadda9d 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , gettext , libexif , libgphoto2 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config gettext libtool ]; diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index c5511847ba0..afb02c9937f 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libtool, pkgconfig, libgphoto2, fuse, glib }: +{ lib, stdenv, fetchurl, libtool, pkg-config, libgphoto2, fuse, glib }: stdenv.mkDerivation rec { pname = "gphoto2fs"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1k23ncbsbh64r7kz050bg31jqamchyswgg9izhzij758d7gc8vk7"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgphoto2 fuse glib libtool ]; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index 5d8296d337f..a1357ff0a08 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, fetchpatch, pkgconfig, exiv2, libxml2, gtk3 +{ fetchFromGitHub, lib, stdenv, fetchpatch, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_42 docbook_xsl libxslt - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 2c14691869f..89a4198a749 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkgconfig, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-database-updates" ]; nativeBuildInputs = [ - intltool pkgconfig + intltool pkg-config wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 876ab562598..fe21631c0d6 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }: +{ lib, stdenv, fetchFromGitHub, poppler, pkg-config, gdk-pixbuf, SDL, gtk2 }: stdenv.mkDerivation { pname = "green-pdfviewer"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ poppler gdk-pixbuf SDL gtk2 ]; patches = [ diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index ef7783f5011..5ebe7765e50 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte +{ lib, stdenv, fetchurl, gtk2, glib, pkg-config, libgnome, libgnomeui, vte , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1si5kidwg0i2jg0brzyvjrzw24v3km2hdgd4kda1adzq81a3p1cs"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 glib libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index f692ea54ccf..21128ac9119 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }: +{ lib, stdenv, fetchurl, automake, autoconf, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "gsimplecal"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ automake autoconf gtk3 ]; preConfigure = "./autogen.sh"; diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 828cd952bbc..d635fa8d865 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2 }: +{lib, stdenv, fetchurl, pkg-config, gtk2 }: stdenv.mkDerivation rec { version = "0.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ stdenv gtk2 ]; preferLocalBuild = true; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index 2ad89a4c160..f0416e232dc 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, pkgs , glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive -, pkgconfig, intltool, autoreconfHook, wrapGAppsHook +, pkg-config, intltool, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool autoreconfHook wrapGAppsHook + pkg-config intltool autoreconfHook wrapGAppsHook ]; buildInputs = [ glib gtksourceview3 gtk3 gtkspell3 poppler diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index d599a295bf1..aa07058dc80 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkgconfig, libiconv }: +{ lib, stdenv, fetchurl, Xaw3d, ghostscriptX, perl, pkg-config, libiconv }: let name = "gv-3.7.4"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { Xaw3d ghostscriptX perl - pkgconfig + pkg-config ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index 13f7395f6f8..9f09e3d978e 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk3, intltool, pkgconfig, texinfo }: +{ lib, stdenv, fetchurl, gtk3, intltool, pkg-config, texinfo }: stdenv.mkDerivation rec { pname = "gxmessage"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "db4e1655fc58f31e5770a17dfca4e6c89028ad8b2c8e043febc87a0beedeef05"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool gtk3 texinfo ]; meta = { diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index 2e2e9f0850e..9e8c5ddaef4 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk2, xorg, glib, xneur, libglade, GConf, libappindicator-gtk2, pcre }: stdenv.mkDerivation { name = "gxneur-0.20.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ xorg.libX11 glib gtk2 xorg.libXpm xorg.libXt xorg.libXext xneur libglade GConf pcre libappindicator-gtk2 diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index e7155c4da35..3cda6d0a318 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, readline, ncurses -, autoreconfHook, pkgconfig, gettext }: +, autoreconfHook, pkg-config, gettext }: stdenv.mkDerivation rec { pname = "hstr"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1chmfdi1dwg3sarzd01nqa82g65q7wdr6hrnj96l75vikwsg986y"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ readline ncurses gettext ]; configureFlags = [ "--prefix=$(out)" ]; diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix index baa0232a23e..d0b9eff35f4 100644 --- a/pkgs/applications/misc/jgmenu/default.nix +++ b/pkgs/applications/misc/jgmenu/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , python3Packages , pango , librsvg @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper python3Packages.wrapPython ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index e118197f42a..6b594f196c9 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, runCommand, fetchzip, fetchurl, fetchpatch, fetchFromGitHub -, cmake, pkgconfig, zlib, libpng, makeWrapper +, cmake, pkg-config, zlib, libpng, makeWrapper , enableGSL ? true, gsl , enableGhostScript ? true, ghostscript , enableMuPDF ? true, mupdf_1_17 @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { --replace "<djvu.h>" "<libdjvu/ddjvuapi.h>" ''; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = let diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 27432a4dd75..273ca0245a2 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , pcsclite, talloc, python2, gnutls }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - autoreconfHook pkgconfig + autoreconfHook pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix index 676b7aea1e2..08bf01aea61 100644 --- a/pkgs/applications/misc/librecad/default.nix +++ b/pkgs/applications/misc/librecad/default.nix @@ -5,7 +5,7 @@ , installShellFiles , mkDerivationWith , muparser -, pkgconfig +, pkg-config , qmake , qtbase , qtsvg @@ -83,7 +83,7 @@ mkDerivationWith stdenv.mkDerivation rec { nativeBuildInputs = [ installShellFiles - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index a54b8a54e8b..e9aa79dcdd8 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , libX11, libxcb, cairo, gtk2, pango, python27, python3 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0v6ylm49f1b44zwq1y1gqxp2csyqblplr24ajllc2q3r0sc9m1ys"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb cairo gtk2 pango python27 python3 ]; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 66d10f5e6b8..52fac494156 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libusb1, pkgconfig, fetchFromGitHub }: +{ lib, stdenv, libusb1, pkg-config, fetchFromGitHub }: stdenv.mkDerivation { pname = "ltwheelconf"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1fsz7k73yln987gcx1jvb5irxfbp1x2c457a60a8yap27nkp5y2w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ]; installPhase = '' diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index 3c915875096..800de77f1c5 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, mkDerivation, pkgconfig, python, file, bc +{ fetchurl, lib, mkDerivation, pkg-config, python, file, bc , qtbase, qtsvg, hunspell, makeWrapper #, mythes, boost }: @@ -12,7 +12,7 @@ mkDerivation rec { }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qtbase qtsvg python file/*for libmagic*/ bc hunspell makeWrapper # enchant diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index 3c1babaab37..a845a767b2a 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc , systemd, pango, cairo, gdk-pixbuf , wayland, wayland-protocols , wrapGAppsHook }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0hwvibpnrximb628w9dsfjpi30b5jy7nfkm4d94z5vhp78p43vxh"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols wrapGAppsHook ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-protocols wrapGAppsHook ]; buildInputs = [ systemd pango cairo gdk-pixbuf wayland ]; mesonFlags = [ "-Dzsh-completions=true" ]; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 99aada11f04..3e8aacb9895 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, wxGTK30-gtk3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, wxGTK30-gtk3 , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index bb90d76977b..7c81e9607f9 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { version = "20.09"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rqg9z7s5bk7vlvjrs4gackzg7ib05a0dffi2ihsjf5a7kw7wcir"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo zlib ]; sourceRoot = "./MediaInfo/Project/GNU/CLI/"; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 1e7aa1f56db..23d34f30d64 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -15,7 +15,7 @@ , libuv , libzen , pcre-cpp -, pkgconfig +, pkg-config , readline , sqlite }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { autoconf automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/megasync/default.nix b/pkgs/applications/misc/megasync/default.nix index b7f8c0a281d..c302a4b4a07 100644 --- a/pkgs/applications/misc/megasync/default.nix +++ b/pkgs/applications/misc/megasync/default.nix @@ -16,7 +16,7 @@ , libzen , lsb-release , mkDerivation -, pkgconfig +, pkg-config , qtbase , qttools , qtx11extras @@ -39,7 +39,7 @@ mkDerivation rec { }; nativeBuildInputs = - [ autoconf automake doxygen lsb-release pkgconfig qttools swig ]; + [ autoconf automake doxygen lsb-release pkg-config qttools swig ]; buildInputs = [ c-ares cryptopp diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index e73805f67b3..8eee8c1f09f 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, pkgconfig, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch , boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { }) ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 95077bdcb33..23da8abc668 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, unzip, pkgconfig, glib, llvmPackages }: +{ lib, stdenv, fetchFromGitHub, unzip, pkg-config, glib, llvmPackages }: stdenv.mkDerivation { pname = "milu-nightly"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { cp bin/milu $out/bin ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib unzip diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 1c25e5c3320..16fa17609e1 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, pkgconfig, meson, ninja, python3 +, pkg-config, meson, ninja, python3 , wrapGAppsHook, vala, shared-mime-info , cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive , discount, gtksourceview3 @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd"; }; - nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; + nativeBuildInputs = [ pkg-config meson ninja python3 wrapGAppsHook vala shared-mime-info ]; buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme discount gtksourceview3 ]; postPatch = '' diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 06835aad4d1..9fa4089c4cd 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, cmake, perl , alsaLib, libevdev, libopus, udev, SDL2 -, ffmpeg_3, pkgconfig, xorg, libvdpau, libpulseaudio, libcec +, ffmpeg_3, pkg-config, xorg, libvdpau, libpulseaudio, libcec , curl, expat, avahi, enet, libuuid, libva }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ alsaLib libevdev libopus udev SDL2 - ffmpeg_3 pkgconfig xorg.libxcb libvdpau libpulseaudio libcec + ffmpeg_3 pkg-config xorg.libxcb libvdpau libpulseaudio libcec xorg.libpthreadstubs curl expat avahi enet libuuid libva ]; diff --git a/pkgs/applications/misc/mupdf/1.17.nix b/pkgs/applications/misc/mupdf/1.17.nix index 722798a43a9..95e9c7c3307 100644 --- a/pkgs/applications/misc/mupdf/1.17.nix +++ b/pkgs/applications/misc/mupdf/1.17.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 190696584db..61c395e64a9 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg +{ stdenv, lib, fetchurl, fetchpatch, pkg-config, freetype, harfbuzz, openjpeg , jbig2dec, libjpeg , darwin , gumbo , enableX11 ? true, libX11, libXext, libXi, libXrandr @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "shared" ]; makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU gumbo ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 34e124367eb..63dde76fabc 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -3,7 +3,7 @@ , substituteAll , cmake , ninja -, pkgconfig +, pkg-config , glibc , gtk3 , gtkmm3 @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - pkgconfig + pkg-config jre swig wrapGAppsHook diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index f1fb59811be..c041c296927 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2 +{ lib, stdenv, fetchFromGitHub, pkg-config, gtk2, fontconfig, freetype, imlib2 , SDL_image, libGLU, libGL, libXmu, freeglut, pcre, dbus, dbus-glib, glib , librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango , atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { qtbase qtlocation qtdeclarative qtsvg ]; - nativeBuildInputs = [ makeWrapper pkgconfig cmake patchelf bzip2 ]; + nativeBuildInputs = [ makeWrapper pkg-config cmake patchelf bzip2 ]; # we dont want blank screen by defaut postInstall = '' diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 1bf16d037f9..4c36b3d930f 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }: +{ lib, stdenv, fetchFromGitHub, pkg-config, ncurses, readline, conf ? null }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configFile = optionalString (conf != null) (builtins.toFile "nnn.h" conf); preBuild = optionalString (conf != null) "cp ${configFile} src/nnn.h"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ readline ncurses ]; makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 5a84f91bb74..0b781f61369 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkgconfig, meson, ninja, python3, pantheon +{ lib, stdenv, fetchFromGitHub, nix-update-script, vala, pkg-config, meson, ninja, python3, pantheon , gtk3, gtksourceview, json-glib, libgee, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index aeeb1051b09..e62b3a33487 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -7,7 +7,7 @@ , libtool , libwnck3 , makeWrapper -, pkgconfig +, pkg-config , gsettings-desktop-schemas }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { preConfigure = "./autogen.sh --libexecdir=$(out)/bin"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper gsettings-desktop-schemas gnome3.gnome-common diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index bc2e4076404..d68601ca6ec 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: +{ lib, stdenv, fetchurl, pkg-config, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "notify-osd"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g5a7a680b05x27apz0y1ldl5csxpp152wqi42s107jymbp0s20j"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper gsettings-desktop-schemas diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index d36efb483db..4694c243b39 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi +{ lib, stdenv, fetchurl, pkg-config, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ]; - nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ]; + nativeBuildInputs = [ autoreconfHook libtool pkg-config makeWrapper ]; configureFlags = [ "--with-all" diff --git a/pkgs/applications/misc/nwg-launchers/default.nix b/pkgs/applications/misc/nwg-launchers/default.nix index e6575b780f7..99033f14a6d 100644 --- a/pkgs/applications/misc/nwg-launchers/default.nix +++ b/pkgs/applications/misc/nwg-launchers/default.nix @@ -5,7 +5,7 @@ , meson , ninja , nlohmann_json -, pkgconfig +, pkg-config , swaylock , makeWrapper }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config cmake makeWrapper ]; diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/applications/misc/ola/default.nix index 6524052e5f3..224b5921baa 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/applications/misc/ola/default.nix @@ -3,7 +3,7 @@ , autoreconfHook , bison , flex -, pkgconfig +, pkg-config , libuuid , cppunit , protobuf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "17a3z3zhx00rjk58icd3zlqfw3753f3y8bwy2sza0frdim09lqr4"; }; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig perl ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config perl ]; buildInputs = [ libuuid cppunit protobuf zlib avahi libmicrohttpd python3 ]; propagatedBuildInputs = [ python3.pkgs.protobuf diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index b6d184efe46..fbaf140a9f7 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -5,7 +5,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , python3 , libgee , gsettings-desktop-schemas @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 65f15c1e7ed..42433936aba 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -20,7 +20,7 @@ , mousetweaks , udev , libxkbcommon -, pkgconfig +, pkg-config , procps , python3 , wrapGAppsHook @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection intltool - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 5467d4faa3b..9d2695f97ff 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { pname = "openbox-menu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index e0c728fc675..25cca1536f8 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, pkgconfig +, pkg-config , fetchurl , buildPythonApplication , autoreconfHook @@ -57,7 +57,7 @@ buildPythonApplication rec { nativeBuildInputs = [ autoreconfHook wrapGAppsHook - pkgconfig + pkg-config libxmlxx3 gettext yelp-tools diff --git a/pkgs/applications/misc/pbpst/default.nix b/pkgs/applications/misc/pbpst/default.nix index ebca7a42409..68b1908e515 100644 --- a/pkgs/applications/misc/pbpst/default.nix +++ b/pkgs/applications/misc/pbpst/default.nix @@ -1,5 +1,5 @@ { llvmPackages, lib, stdenv, fetchFromGitHub -, python36Packages, which, pkgconfig, curl, git, gettext, jansson +, python36Packages, which, pkg-config, curl, git, gettext, jansson # Optional overrides , maxFileSize ? 64 # in MB @@ -20,7 +20,7 @@ llvmPackages.stdenv.mkDerivation rec { nativeBuildInputs = [ python36Packages.sphinx which - pkgconfig + pkg-config curl git gettext diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index e9158d252c6..da1c79865a7 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkgconfig +{ lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config , wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: let @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; - nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index cb8b6150777..484b9d3b407 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, gtk2, libXft, intltool, automake, autoconf, libtool, pkg-config }: stdenv.mkDerivation rec { pname = "pcmanx-gtk2"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0fbwd149wny67rfhczz4cbh713a1qnswjiz7b6c2bxfcwh51f9rc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 libXft intltool automake autoconf libtool ]; preConfigure = '' diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 456acb9bbd1..da9340f3075 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gnome-doc-utils, intltool, lib +{ stdenv, fetchurl, fetchpatch, pkg-config, gnome-doc-utils, intltool, lib , mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome2, poppler, wrapGAppsHook }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "0fpz9ifr6476lqhd5rkb94dm68vlrwdq5w1aaxzgyjgdax9hxx81"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gnome-doc-utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index 1e7f0352c47..6430b894b7b 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, vala, gtk3, libgee, fetchpatch +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, vala, gtk3, libgee, fetchpatch , poppler, libpthreadstubs, gstreamer, gst-plugins-base, gst-plugins-good, gst-libav, librsvg, pcre, gobject-introspection, wrapGAppsHook , webkitgtk, discount, json-glib }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig vala + cmake pkg-config vala # For setup hook gobject-introspection wrapGAppsHook diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index cdc08686124..b462e5f134b 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -13,7 +13,7 @@ , libXi , pango , gettext -, pkgconfig +, pkg-config , libxml2 , bamf , gdk-pixbuf @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { gettext gnome3.gnome-common libxml2 # xmllint - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 2556eb02062..c79da21ad63 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,4 +1,4 @@ -{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig +{ cairo, cmake, fetchFromGitHub, libXdmcp, libpthreadstubs, libxcb, pcre, pkg-config , python3, lib, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage , xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper , removeReferencesTo @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { '' else ""; nativeBuildInputs = [ - cmake pkgconfig removeReferencesTo + cmake pkg-config removeReferencesTo ]; postFixup = '' diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index 80936d910a3..7cd31adfa32 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , boost, cereal, curl, eigen, expat, glew, libpng, tbb, wxGTK31 , gtest, nlopt, xorg, makeDesktopItem , cgal_5, gmp, ilmbase, mpfr, qhull, openvdb, systemd @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 011b782053e..b243f194181 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, makeWrapper, gtk3, json_c, taskwarrior }: +{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }: stdenv.mkDerivation rec { name = "ptask-1.0.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 json_c ]; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; patches = [ ./tw-version.patch ./json_c_is_error.patch ]; diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index c1b9d04d673..2e7c77c0935 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, zip, gettext, perl , wxGTK30, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - cmake gettext perl pkgconfig zip + cmake gettext perl pkg-config zip ]; buildInputs = [ libXext libXi libXt libXtst wxGTK30 diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index ac1db54ebce..c6b9d82bcf4 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -3,7 +3,7 @@ , libGLU , mkDerivationWith , muparser -, pkgconfig +, pkg-config , qtbase , qmake , qtscript @@ -85,7 +85,7 @@ mkDerivationWith stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index 0f359007696..c6306294ecd 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev +{ lib, stdenv, mkDerivation, fetchFromGitHub, qmake, pkg-config, udev , qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -14,7 +14,7 @@ mkDerivation rec { sha256 = "PB1Y8N1TrJMcS7A2e1nKjsUlAxOYjdJqBhbyuDCAbGs="; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 6cdd97e666f..3b61e3dbc1a 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, libeb, lzo +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo , qtbase, qtmultimedia, qttools, qtwebengine }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libeb lzo qtbase qtmultimedia qttools qtwebengine ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 8e8ffb2921c..0892632c1d8 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler, djvulibre, libspectre, cups +{lib, stdenv, mkDerivation, fetchurl, qmake, qtbase, qtsvg, pkg-config, poppler, djvulibre, libspectre, cups , file, ghostscript }: let @@ -10,7 +10,7 @@ let url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; sha256 = "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qtsvg poppler djvulibre libspectre cups file ghostscript ]; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index ee95d6baeba..81a4ef3d99f 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, gtk2, synergy}: +{lib, stdenv, fetchurl, pkg-config, gtk2, synergy}: stdenv.mkDerivation rec { pname = "quicksynergy"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 synergy diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix index 35ffb804c49..8f78c0becaf 100644 --- a/pkgs/applications/misc/razergenie/default.nix +++ b/pkgs/applications/misc/razergenie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, meson, ninja, pkgconfig, qtbase, qttools +{ stdenv, fetchFromGitHub, lib, meson, ninja, pkg-config, qtbase, qttools , wrapQtAppsHook , enableExperimental ? false , includeMatrixDiscovery ? false @@ -19,7 +19,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig meson ninja wrapQtAppsHook + pkg-config meson ninja wrapQtAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index ec40347cbcb..844fd19e22c 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkgconfig, libssh2 +{ stdenv, lib, fetchFromGitHub, fetchFromGitiles, pkg-config, libssh2 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols , qtsvg, qttools, qtquick1, qtcharts , qmake @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sha256 = "0yd4i944d4blw8jky0nxl7sfkkj975q4d328rdcbhizwvf6dx81f"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats qtquick1 qtquickcontrols qtsvg qttools qtcharts diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 81a8267e51d..5798473db5e 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchFromGitLab , autoconf, automake, gettext, intltool -, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection +, libtool, pkg-config, wrapGAppsHook, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg , withQuartz ? stdenv.isDarwin, ApplicationServices @@ -30,7 +30,7 @@ let gettext intltool libtool - pkgconfig + pkg-config wrapGAppsHook wrapPython ]; diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index a6762d7d846..eac131d6ef7 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -3,7 +3,7 @@ , vala , gettext , libxml2 -, pkgconfig +, pkg-config , glib , gtk3 , gnome3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix index 14742da35da..73d8999be5b 100644 --- a/pkgs/applications/misc/rofi-emoji/default.nix +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -6,7 +6,7 @@ , makeWrapper , autoreconfHook -, pkgconfig +, pkg-config , cairo , glib @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix index d5b0944ac39..0f9067a7e39 100644 --- a/pkgs/applications/misc/rofi-file-browser/default.nix +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, rofi, gtk3 }: stdenv.mkDerivation rec { pname = "rofi-file-browser-extended"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { --replace "/usr/share/" "$out/share/" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rofi gtk3 ]; ROFI_PLUGINS_DIR = "$out/lib/rofi"; diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 6ee2cb8c349..33a37e32612 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, autoreconfHook, pkgconfig, libxkbcommon, pango, which, git +, autoreconfHook, pkg-config, libxkbcommon, pango, which, git , cairo, libxcb, xcbutil, xcbutilwm, xcbutilxrm, libstartup_notification , bison, flex, librsvg, check }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -i 's/~root/~nobody/g' test/helper-expand.c ''; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which ]; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index 21cf60b60fc..0ae7a5c1ec0 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, yacc, ncurses, libxml2, libzip, libxls, pkg-config }: stdenv.mkDerivation rec { version = "0.7.0"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0xi0n9qzby012y2j7hg4fgcwyly698sfi4i9gkvy0q682jihprbk"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ yacc ncurses libxml2 libzip libxls ]; buildPhase = '' diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index ea3fc7d30f1..391ef82daf1 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, gettext, readline }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, gettext, readline }: stdenv.mkDerivation rec { pname = "sdcv"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib gettext readline ]; preInstall = '' diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index ff7fc7dd082..c8a0e0175fa 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, nix-update-script -, vala, meson, ninja, pkgconfig, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils +, vala, meson, ninja, pkg-config, pantheon, gettext, wrapGAppsHook, python3, desktop-file-utils , gtk3, glib, libgee, libgda, gtksourceview, libxml2, libsecret, libssh2 }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { sha256 = "090plqnby2wxzr1waq5kz89w3269j363mgxwfz9g7qg55lddaahz"; }; - nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; + nativeBuildInputs = [ meson ninja pkg-config vala gettext wrapGAppsHook python3 desktop-file-utils ]; buildInputs = [ gtk3 glib pantheon.granite libgee sqlGda gtksourceview libxml2 libsecret libssh2 ]; diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index ed0dde0ffaf..e9ba7b2a8f3 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation rec { pname = "slade"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0mdn59jm6ab4cdh99bgvadif3wdlqmk5mq635gg7krq35njgw6f6"; }; - nativeBuildInputs = [ cmake pkgconfig zip ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; meta = with lib; { diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index b7fee00a40f..dfbfbe55669 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, wxGTK, gtk2, sfml, fluidsynth, curl, freeimage, ftgl, glew, zip }: stdenv.mkDerivation { name = "slade-git-3.1.2.2018.01.29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; cmakeFlags = ["-DNO_WEBVIEW=1"]; - nativeBuildInputs = [ cmake pkgconfig zip ]; + nativeBuildInputs = [ cmake pkg-config zip ]; buildInputs = [ wxGTK gtk2 sfml fluidsynth curl freeimage ftgl glew ]; meta = with lib; { diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index e4f86427386..613d2f8e78b 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, writeText, libX11, conf ? null, patches ? [] }: +{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }: with lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { inherit patches; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 85ce1e6b1bb..e08240733d1 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -1,5 +1,5 @@ { pkgs, fetchFromGitHub, lib, stdenv, gtk3, udev, desktop-file-utils -, shared-mime-info, intltool, pkgconfig, wrapGAppsHook, ffmpegthumbnailer +, shared-mime-info, intltool, pkg-config, wrapGAppsHook, ffmpegthumbnailer , jmtpfs, ifuseSupport ? false, ifuse ? null, lsof, udisks2 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 udev desktop-file-utils shared-mime-info intltool wrapGAppsHook ffmpegthumbnailer jmtpfs lsof udisks2 diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index ab3423c4737..51d015c6e41 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake +{ lib, stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkg-config, qmake , curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -84,7 +84,7 @@ in stdenv.mkDerivation { qtbase qtconnectivity qtsvg qttools qtwebkit ]; - nativeBuildInputs = [ cmake wrapQtAppsHook pkgconfig ]; + nativeBuildInputs = [ cmake wrapQtAppsHook pkg-config ]; cmakeFlags = [ "-DLIBDC_FROM_PKGCONFIG=ON" diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix index 11798db34f5..bf1fdf63fed 100644 --- a/pkgs/applications/misc/swappy/default.nix +++ b/pkgs/applications/misc/swappy/default.nix @@ -5,7 +5,7 @@ , cairo , pango , gtk -, pkgconfig +, pkg-config , cmake , scdoc , libnotify @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "14ac2jmnak7avcz0jhqjm30vk7pv3gq5aq5rdyh84k8c613kkicf"; }; - nativeBuildInputs = [ glib meson ninja pkgconfig cmake scdoc ]; + nativeBuildInputs = [ glib meson ninja pkg-config cmake scdoc ]; buildInputs = [ cairo pango gtk libnotify wayland glib ]; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index 6f8dd068de8..da822f5347b 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, pkgconfig, glib, libnotify, gtk3, libgee +{ lib, stdenv, fetchurl, gettext, pkg-config, glib, libnotify, gtk3, libgee , keybinder3, json-glib, zeitgeist, vala, gobject-introspection }: @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig gettext vala + pkg-config gettext vala # For setup hook gobject-introspection ]; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index ab57bf7a430..15ef1654e70 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkgconfig, libappindicator-gtk3 }: +{ lib, stdenv, fetchFromGitHub, buildGoPackage, pkg-config, libappindicator-gtk3 }: buildGoPackage rec { pname = "syncthing-tray"; @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libappindicator-gtk3 ]; meta = with lib; { diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index 993606d39c0..c480c7a8e2f 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -1,4 +1,4 @@ -{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkgconfig, Security, stdenv }: +{ rustPlatform, lib, fetchFromGitHub, ncurses, openssl, pkg-config, Security, stdenv }: rustPlatform.buildRustPackage rec { pname = "taizen"; @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index eb49853885b..44c46f74655 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig +{ mkDerivation, lib, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkg-config , cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco , qtbase, qtwebengine, qtx11extras, sqlite }: @@ -68,7 +68,7 @@ let sourceRoot = "source/src"; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; postPatch = '' @@ -93,7 +93,7 @@ let ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem ''; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ bugsnag-qt diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index 7c089d830e0..5aaec7a1e60 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, itstool, intltool, pkgconfig +{ stdenv, fetchurl, itstool, intltool, pkg-config , libxml2, gnome2, atk, gtk2, glib , mono, mono-addins, dbus-sharp-2_0, dbus-sharp-glib-2_0, gnome-sharp, gtk-sharp-2_0 , makeWrapper, lib}: @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "0j5jmd079bm2fydqaic5ymbfdxna3qlx6fkp2mqhgcdr7prsbl3q"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ itstool intltool libxml2 gnome2.GConf atk gtk2 mono mono-addins dbus-sharp-2_0 dbus-sharp-glib-2_0 gnome-sharp gtk-sharp-2_0 diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 70568f92383..3b9b09aaba9 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -5,7 +5,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , python3 , libgee , gsettings-desktop-schemas @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 69f58b828c4..b7974966be4 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkgconfig, boost }: +{ lib, mkDerivation, fetchFromGitHub, qtbase, qtx11extras, qmake, pkg-config, boost }: mkDerivation { name = "twmn-git-2018-10-01"; @@ -10,7 +10,7 @@ mkDerivation { sha256 = "0mpjvp800x07lp9i3hfcc5f4bqj1fj4w3dyr0zwaxc6wqmm0fdqz"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtbase qtx11extras boost ]; postPatch = '' diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 1da61f9dcb0..e83a5e9a2c7 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl, intltool, glib, pkgconfig, udev, util-linux, acl }: +{ lib, stdenv, fetchurl, intltool, glib, pkg-config, udev, util-linux, acl }: stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ intltool glib udev ]; configurePhase = '' substituteInPlace src/Makefile.in --replace "-o root -g root" "" diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index d44e49f77cf..15bda9d5f97 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, makeself, yasm, fuse, wxGTK, lvm2 }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, makeself, yasm, fuse, wxGTK, lvm2 }: with lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sourceRoot = "src"; - nativeBuildInputs = [ makeself pkgconfig yasm ]; + nativeBuildInputs = [ makeself pkg-config yasm ]; buildInputs = [ fuse lvm2 wxGTK ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index be354d60dc4..9f27f8e73d7 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libgnomeui, libxml2 }: +{ lib, stdenv, fetchurl, pkg-config, libgnomeui, libxml2 }: stdenv.mkDerivation rec { pname = "verbiste"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "02kzin3pky2q2jnihrch8y0hy043kqqmzxq8j741x80kl0j1qxkm"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libgnomeui libxml2 ]; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 4cf13c9c7aa..18d190a9dd6 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, pkgconfig +, pkg-config , ncurses, libX11 , util-linux, file, which, groff @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { sha256 = "0rqyd424y0g5b5basw2ybb60r9gar4f40d1xgzr3c2dsy4jpwvyh"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ ncurses libX11 util-linux file which groff ]; postFixup = let diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 7fd5b34ee3b..61ebfb0fcc6 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, lib, stdenv, makeWrapper -, pkgconfig, intltool, gettext, gtk2, expat, curl +, pkg-config, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, gpsbabel, expect , withMapnik ? false, mapnik @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 ] ++ lib.optional withMapnik mapnik diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index c565bfe0ce3..d70918f2e7c 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg +, pkg-config, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg , dbus-glib, autoreconfHook, wrapGAppsHook }: stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { }) ]; - nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index d198a15c252..b4591d8717c 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchurl, pkgconfig, qmake, qtscript, qtsvg }: +{ lib, stdenv, mkDerivation, fetchurl, pkg-config, qmake, qtscript, qtsvg }: mkDerivation rec { pname = "vym"; @@ -32,7 +32,7 @@ mkDerivation rec { hardeningDisable = [ "format" ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ qtscript qtsvg ]; postInstall = '' diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index bbccf7fee22..c1616c739c9 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, wrapGAppsHook , wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 @@ -21,7 +21,7 @@ }; nativeBuildInputs = [ - meson ninja pkgconfig scdoc wrapGAppsHook cmake + meson ninja pkg-config scdoc wrapGAppsHook cmake ] ++ lib.optional withMediaPlayer gobject-introspection; propagatedBuildInputs = lib.optionals withMediaPlayer [ diff --git a/pkgs/applications/misc/web-media-controller/default.nix b/pkgs/applications/misc/web-media-controller/default.nix index ccd1e229902..7e0fbb999f5 100644 --- a/pkgs/applications/misc/web-media-controller/default.nix +++ b/pkgs/applications/misc/web-media-controller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, glib, pcre, json-glib }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, pcre, json-glib }: stdenv.mkDerivation rec { pname = "wmc-mpris"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1zcnaf9g55cbj9d2zlsr0i15qh0w9gp5jmxkm6dcp1j6yd7j3ymc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glib pcre json-glib ]; cmakeFlags = [ "-DCHROMIUM_MANIFEST_DESTINATION=${placeholder "out"}/etc/chromium/native-messaging-hosts" diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 113b674f862..6b63fde222f 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, wrapGAppsHook -, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkgconfig +, autoconf, autoconf-archive, automake, gettext, intltool, libtool, pkg-config , libICE, libSM, libXScrnSaver, libXtst, cheetah , gobject-introspection, glib, glibmm, gtkmm3, atk, pango, pangomm, cairo , cairomm , dbus, dbus-glib, gdome2, gstreamer, gst-plugins-base @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - autoconf autoconf-archive automake gettext intltool libtool pkgconfig wrapGAppsHook + autoconf autoconf-archive automake gettext intltool libtool pkg-config wrapGAppsHook ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index bf6b37b1028..9e05e09caef 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkg-config , libtool, openssl, qtbase, qttools }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { buildInputs = [ libtool openssl qtbase ]; - nativeBuildInputs = [ autoreconfHook pkgconfig qttools ]; + nativeBuildInputs = [ autoreconfHook pkg-config qttools ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index c9a2e3b36ae..17e58cb54d7 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fox, pkgconfig, gettext, xlibsWrapper, gcc, intltool, file, libpng }: +{ lib, stdenv, fetchurl, fox, pkg-config, gettext, xlibsWrapper, gcc, intltool, file, libpng }: stdenv.mkDerivation rec { name = "xfe-1.42"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1v1v0vcbnm30kpyd3rj8f56yh7lfnwy7nbs9785wi229b29fiqx1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ fox gettext xlibsWrapper gcc intltool file libpng ]; preConfigure = '' diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 13bda4f2332..10034fbe1b1 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -2,7 +2,7 @@ # at https://www.x.org/releases/individual/. # That is why this expression is not inside pkgs.xorg -{lib, stdenv, fetchurl, makeWrapper, libX11, pkgconfig, libXaw}: +{lib, stdenv, fetchurl, makeWrapper, libX11, pkg-config, libXaw}: stdenv.mkDerivation rec { name = "xfontsel-1.0.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [libX11 makeWrapper libXaw]; # Without this, it gets Xmu as a dependency, but without rpath entry diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index efdd7f2b0f1..01706011e2d 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig +{ lib, stdenv, fetchFromGitHub, pkg-config , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { sha256 = "14il9k4i58qbc78hcadw3gqy21sb9q661d75vlj6fwpczbzj7x1a"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook wafHook ]; buildInputs = [ python intltool docbook2x docbook_xml_dtd_412 libxslt sword clucene_core biblesync gnome-doc-utils libgsf gconf gtkhtml libglade scrollkeeper webkitgtk dbus-glib enchant isocodes libuuid icu ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 9c3795ef394..bb4e1727f69 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib +{ lib, stdenv, fetchurl, pkg-config, intltool, xorg, pcre, gst_all_1, glib , xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - pkgconfig intltool wrapGAppsHook + pkg-config intltool wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index acb1cbf90e3..dbb5eb42e1d 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoreconfHook, pkgconfig, wrapGAppsHook +, autoreconfHook, pkg-config, wrapGAppsHook , glib, intltool, gtk3, gtksourceview }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1qpmlwn0bcw1q73ag0l0fdnlzmwawfvsy4g9y5b0vyrc58lcp5d3"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ glib intltool gtk3 gtksourceview ]; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index d2cc2bf7ad1..ba798a861a8 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libXt }: +{ lib, stdenv, fetchurl, pkg-config, libXt }: stdenv.mkDerivation rec { pname = "xscope"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXt ]; meta = with lib; { diff --git a/pkgs/applications/misc/xsuspender/default.nix b/pkgs/applications/misc/xsuspender/default.nix index a5bd8a02ebf..93e56f1df2d 100644 --- a/pkgs/applications/misc/xsuspender/default.nix +++ b/pkgs/applications/misc/xsuspender/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config , glib, libwnck3, procps }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" "doc" ]; - nativeBuildInputs = [ cmake pkgconfig makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ]; buildInputs = [ glib libwnck3 ]; postInstall = '' diff --git a/pkgs/applications/misc/xsw/default.nix b/pkgs/applications/misc/xsw/default.nix index d20489d37f3..a664aec45e1 100644 --- a/pkgs/applications/misc/xsw/default.nix +++ b/pkgs/applications/misc/xsw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }: +{ stdenv, lib, fetchFromGitHub, pkg-config, SDL, SDL_image, SDL_ttf, SDL_gfx, flex, bison }: let makeSDLFlags = map (p: "-I${lib.getDev p}/include/SDL"); @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "092vp61ngd2vscsvyisi7dv6qrk5m1i81gg19hyfl5qvjq5p0p8g"; }; - nativeBuildInputs = [ pkgconfig flex bison ]; + nativeBuildInputs = [ pkg-config flex bison ]; buildInputs = [ SDL SDL_image SDL_ttf SDL_gfx ]; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 36fd685b799..7a0111785c1 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -1,9 +1,9 @@ { lib, stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep -, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkgconfig +, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkg-config }: assert svgSupport -> - librsvg != null && glib != null && gdk-pixbuf != null && pkgconfig != null; + librsvg != null && glib != null && gdk-pixbuf != null && pkg-config != null; stdenv.mkDerivation rec { name = "xxkb-1.11.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ imake gccmakedep ]; buildInputs = [ libX11 libXt libXext libXpm - ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ]; + ] ++ lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkg-config ]; outputs = [ "out" "man" ]; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 6c03bbc33b3..3046638ec4a 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, qt4, openssl, pkgconfig }: +{ stdenv, fetchurl, lib, qt4, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "yate"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # TODO zaptel ? postgres ? - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ qt4 openssl ]; # /dev/null is used when linking which is a impure path for the wrapper diff --git a/pkgs/applications/misc/zathura/cb/default.nix b/pkgs/applications/misc/zathura/cb/default.nix index 4e2d16819ba..69ecb1cfd1b 100644 --- a/pkgs/applications/misc/zathura/cb/default.nix +++ b/pkgs/applications/misc/zathura/cb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core , girara, gettext, libarchive }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; buildInputs = [ libarchive zathura_core girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix index c56f42691f7..5690dc0db10 100644 --- a/pkgs/applications/misc/zathura/core/default.nix +++ b/pkgs/applications/misc/zathura/core/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig +{ lib, stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkg-config , appstream-glib, desktop-file-utils, python3 , gtk, girara, gettext, libxml2, check , sqlite, glib, texlive, libintl, libseccomp @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ] ++ optional (!stdenv.isLinux) "-Dseccomp=disabled"; nativeBuildInputs = [ - meson ninja pkgconfig desktop-file-utils python3.pkgs.sphinx + meson ninja pkg-config desktop-file-utils python3.pkgs.sphinx gettext wrapGAppsHook libxml2 check appstream-glib ]; diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix index a5ed7ab6781..f0fe0948632 100644 --- a/pkgs/applications/misc/zathura/djvu/default.nix +++ b/pkgs/applications/misc/zathura/djvu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gtk, zathura_core, girara, djvulibre, gettext }: stdenv.mkDerivation rec { pname = "zathura-djvu"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ djvulibre gettext zathura_core gtk girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 97f36f82847..d787705be15 100644 --- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -7,7 +7,7 @@ , libjpeg , mupdf , openjpeg_2 -, pkgconfig +, pkg-config , zathura_core }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { sha256 = "1r3v37k9fl2rxipvacgxr36llywvy7n20a25h3ajlyk70697sa66"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ cairo diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix index bafa293ad9c..b76e72a6970 100644 --- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, poppler }: +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, poppler }: stdenv.mkDerivation rec { pname = "zathura-pdf-poppler"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m"; }; - nativeBuildInputs = [ meson ninja pkgconfig zathura_core ]; + nativeBuildInputs = [ meson ninja pkg-config zathura_core ]; buildInputs = [ poppler girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix index 05cc570eb8f..ee63a9df53b 100644 --- a/pkgs/applications/misc/zathura/ps/default.nix +++ b/pkgs/applications/misc/zathura/ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, meson, ninja, pkgconfig, zathura_core, girara, libspectre, gettext }: +{ stdenv, lib, fetchurl, meson, ninja, pkg-config, zathura_core, girara, libspectre, gettext }: stdenv.mkDerivation rec { pname = "zathura-ps"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y"; }; - nativeBuildInputs = [ meson ninja pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkg-config gettext ]; buildInputs = [ libspectre zathura_core girara ]; PKG_CONFIG_ZATHURA_PLUGINDIR = "lib/zathura"; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 123c3cc08a6..d271f22e67c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -2,7 +2,7 @@ , src, unpackPhase ? null, patches ? [] , extraNativeBuildInputs ? [], extraConfigureFlags ? [], extraMakeFlags ? [] }: -{ lib, stdenv, pkgconfig, pango, perl, python3, zip +{ lib, stdenv, pkg-config, pango, perl, python3, zip , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, nss_3_53 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper @@ -222,7 +222,7 @@ buildStdenv.mkDerivation ({ llvmPackages.llvm # llvm-objdump nodejs perl - pkgconfig + pkg-config python3 rust-cbindgen rustc diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index e634b0f566f..917da034c30 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, wrapGAppsHook , help2man, luafilesystem, luajit, sqlite , webkitgtk, gtk3, gst_all_1, glib-networking }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig help2man wrapGAppsHook + pkg-config help2man wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 7bda7cdcbf7..713f934f778 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages -, fetchurl, pkgconfig, ncurses, gzip +, fetchurl, pkg-config, ncurses, gzip , sslSupport ? true, openssl ? null , nukeReferences }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ nukeReferences ] - ++ lib.optional sslSupport pkgconfig; + ++ lib.optional sslSupport pkg-config; buildInputs = [ ncurses gzip ] ++ lib.optional sslSupport openssl.dev; diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 7ea22641126..2a4dc9e389a 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -4,7 +4,7 @@ , graphicsSupport ? !stdenv.isDarwin, imlib2 ? null , x11Support ? graphicsSupport, libX11 ? null , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null -, perl, man, pkgconfig, buildPackages, w3m +, perl, man, pkg-config, buildPackages, w3m }: assert sslSupport -> openssl != null; @@ -18,7 +18,7 @@ let mktable = buildPackages.stdenv.mkDerivation { name = "w3m-mktable"; inherit (w3m) src; - nativeBuildInputs = [ pkgconfig boehmgc ]; + nativeBuildInputs = [ pkg-config boehmgc ]; makeFlags = [ "mktable" ]; installPhase = '' install -D mktable $out/bin/mktable @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { sed -ie 's!mktable.*:.*!mktable:!' Makefile.in ''; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ ncurses boehmgc zlib ] ++ optional sslSupport openssl ++ optional mouseSupport gpm-ncurses diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index d163f8a7475..e6d4845761a 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -2,7 +2,7 @@ , fetchFromGitLab , meson , ninja -, pkgconfig +, pkg-config , libhandy_0 , modemmanager , gtk3 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config desktop-file-utils vala wrapGAppsHook diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index e23f94634de..445ee89d5cd 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -10,7 +10,7 @@ , vala , meson , ninja -, pkgconfig +, pkg-config , dconf , gst_all_1 , wrapGAppsHook @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config wrapGAppsHook python3 gobject-introspection # for setup hook diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index 50f2ab14a77..c833dea21c7 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config }: buildGoPackage rec { pname = "docker-machine-kvm"; @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libvirt ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 49e59ab7093..8c3534006bf 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, cctools, Hypervisor, vmnet }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkg-config, cctools, Hypervisor, vmnet }: buildGoPackage rec { pname = "docker-machine-xhyve"; @@ -26,7 +26,7 @@ buildGoPackage rec { sha256 = "0000v97fr8xc5b39v44hsa87wrbk4bcwyaaivxv4hxlf4vlgg863"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ Hypervisor vmnet ]; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/habitat/default.nix b/pkgs/applications/networking/cluster/habitat/default.nix index 9abaeef8013..f9b67b6821a 100644 --- a/pkgs/applications/networking/cluster/habitat/default.nix +++ b/pkgs/applications/networking/cluster/habitat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkgconfig +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config , libsodium, libarchive, openssl, zeromq }: rustPlatform.buildRustPackage rec { @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "08sncz0jgsr2s821j3s4bk7d54xqwmnld7m57avavym1xqvsnbmy"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libsodium libarchive openssl zeromq ]; cargoBuildFlags = ["--package hab"]; diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index af92920645e..4f3dfcfc03f 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkgconfig, which, maven, cmake, jre, bash +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, which, maven, cmake, jre, bash , coreutils, glibc, protobuf2_5, fuse, snappy, zlib, bzip2, openssl, openssl_1_0_2 }: @@ -34,7 +34,7 @@ let outputHash = dependencies-sha256; }; - nativeBuildInputs = [ maven cmake pkgconfig ]; + nativeBuildInputs = [ maven cmake pkg-config ]; buildInputs = [ fuse snappy zlib bzip2 opensslPkg protobuf2_5 ]; # most of the hardcoded pathes are fixed in 2.9.x and 3.0.0, this list of patched files might be reduced when 2.7.x and 2.8.x will be deprecated postPatch = '' diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index c35579def7e..5a7d953a069 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -11,7 +11,7 @@ , runc , kmod , libseccomp -, pkgconfig +, pkg-config , ethtool , util-linux , ipset @@ -128,7 +128,7 @@ let patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkgconfig ]; + nativeBuildInputs = [ git pkg-config ]; buildInputs = [ libseccomp ]; buildPhase = '' @@ -168,7 +168,7 @@ let patches = [ ./patches/0001-Use-rm-from-path-in-go-generate.patch ./patches/0002-Add-nixpkgs-patches.patch ]; - nativeBuildInputs = [ git pkgconfig ]; + nativeBuildInputs = [ git pkg-config ]; # These dependencies are embedded as compressed files in k3s at runtime. # Propagate them to avoid broken runtime references to libraries. propagatedBuildInputs = [ k3sPlugins k3sBuildStage1 runc ]; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index f9391373b18..5b3b17b3df2 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkgconfig, makeWrapper +{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkg-config, makeWrapper , glib, gtk3, libappindicator-gtk3, gpgme, openshift, ostree, libselinux, btrfs-progs , lvm2, docker-machine-kvm }: @@ -21,7 +21,7 @@ in buildGoPackage rec { sha256 = "0yhln3kyc0098hbnjyxhbd915g6j7s692c0z8yrhh9gdpc5cr2aa"; }; - nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; + nativeBuildInputs = [ pkg-config go-bindata makeWrapper ]; buildInputs = [ glib gtk3 libappindicator-gtk3 gpgme ostree libselinux btrfs-progs lvm2 ]; goPackagePath = "github.com/minishift/minishift"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index 3caab38a3ef..6efdf77bfce 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, makeWrapper, cdrtools }: +{ lib, stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkg-config, makeWrapper, cdrtools }: # USAGE: # install the following package globally or in nix-shell: @@ -30,7 +30,7 @@ buildGoPackage rec { sha256 = "0ak2lpnv6h0i7lzfcggd90jpfhvsasdr6nflkflk2drlcpalggj9"; }; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ libvirt ]; diff --git a/pkgs/applications/networking/feedreaders/castget/default.nix b/pkgs/applications/networking/feedreaders/castget/default.nix index 6aec4540147..f0f09c8de7e 100644 --- a/pkgs/applications/networking/feedreaders/castget/default.nix +++ b/pkgs/applications/networking/feedreaders/castget/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , autoreconfHook -, pkgconfig +, pkg-config , glib , ronn , curl @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { # See comment on locale above glibcLocales autoreconfHook - pkgconfig + pkg-config ]; meta = with lib; { diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index 2df2b9ce786..d550a126547 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkgconfig, vala, gettext, python3 +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, pantheon , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig vala gettext appstream-glib desktop-file-utils + meson ninja pkg-config vala gettext appstream-glib desktop-file-utils libxml2 python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index a24105f8315..4c47c316753 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -7,7 +7,7 @@ , libfilezilla , libidn , nettle -, pkgconfig +, pkg-config , pugixml , sqlite , tinyxml @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { "--disable-autoupdatecheck" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ dbus diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index 335b94cd2f4..a359bf3a7c0 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, vala +{ lib, stdenv, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, vala , gtk3, libgee, libsoup, libsecret, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { gobject-introspection meson ninja - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 3beb431042a..17ace3021d8 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, pkgconfig, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper +{lib, stdenv, pkg-config, luajit, openssl, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper , libtirpc }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "13lzvjli6kbsnkd7lf0rm71l2mnz38pxk76ia9yrjb6clfhlbb73"; }; - buildInputs = [ makeWrapper pkgconfig luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; + buildInputs = [ makeWrapper pkg-config luajit openssl libpcap pcre libdnet daq zlib flex bison libtirpc ]; NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; diff --git a/pkgs/applications/networking/ids/suricata/default.nix b/pkgs/applications/networking/ids/suricata/default.nix index 40dbbddbb3e..00f6aee0915 100644 --- a/pkgs/applications/networking/ids/suricata/default.nix +++ b/pkgs/applications/networking/ids/suricata/default.nix @@ -3,7 +3,7 @@ , fetchurl , clang , llvm -, pkgconfig +, pkg-config , makeWrapper , file , hyperscan @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { clang llvm makeWrapper - pkgconfig + pkg-config ] ++ lib.optionals rustSupport [ rustc cargo ] ; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index d947fa76dff..77a7dcca747 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1 +{ lib, stdenv, fetchurl, zlib, openssl, libre, librem, pkg-config, gst_all_1 , cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3 , gsm, speex, portaudio, spandsp, libuuid, libvpx }: @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz"; sha256 = "13di0ycdcr2q2a20mjvyaqfmvk5xldwqaxklqsz7470jnbc5n0rb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [zlib openssl libre librem cairo mpg123 alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid libvpx diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 4af62e05c93..543a5f52c97 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: with lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "00qgdvrp7hv02n0ns685igp810zxmv3adsama8601122al6x041n"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ bitlbee ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix index 76cf10e7b14..8023c70fe5f 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, json-glib }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, json-glib }: with lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; + nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ bitlbee json-glib ]; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix index ce94ab62659..f1b2df658a6 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-mastodon/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkgconfig, glib }: +{ lib, fetchgit, stdenv, bitlbee, autoreconfHook, pkg-config, glib }: with lib; stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0a8196pyr6bjnqg82zn7jdhiv7xsg4npbpzalla1i2h99j30q8pk"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ bitlbee ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix index 57ea99ee921..14464247659 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }: +{ lib, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkg-config, glib, libgcrypt }: with lib; stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "121r92mgwv445wwxzh35n19fs5k81ihr0j19k256ia5502b1xxaq"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ bitlbee autoconf automake libtool libgcrypt ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 022fde67365..1a83a04a1fa 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkgconfig, check, libotr, python +{ lib, fetchurl, fetchpatch, stdenv, gnutls, glib, pkg-config, check, libotr, python , enableLibPurple ? false, pidgin ? null , enablePam ? false, pam ? null }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0zhhcbcr59sx9h4maf8zamzv2waya7sbsl7w74gbyilvy93dw5cz"; }; - nativeBuildInputs = [ pkgconfig ] ++ optional doCheck check; + nativeBuildInputs = [ pkg-config ] ++ optional doCheck check; buildInputs = [ gnutls libotr python ] ++ optional enableLibPurple pidgin diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 617c02de263..f9789cfda41 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, stdenv, lib, pkgconfig, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: +{ mkDerivation, stdenv, lib, pkg-config, fetchFromGitHub, qtbase, qtsvg, qtmultimedia, qmake, boost, openssl, wrapQtAppsHook }: mkDerivation rec { pname = "chatterino2"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz"; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ]; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p "$out/Applications" diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index d16ad19428f..0de7e264ec4 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, +{ lib, stdenv, buildGoPackage, fetchFromGitHub, pkg-config, cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: buildGoPackage rec { @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 8e6725d6067..0474f21a2b9 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext +, vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext , gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { vala cmake ninja - pkgconfig + pkg-config wrapGAppsHook gettext ]; diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 2fe770e56eb..4c28e346a12 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchFromGitHub -, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: stdenv.mkDerivation rec { pname = "freetalk"; version = "4.1"; - + src = fetchFromGitHub { owner = "GNUFreetalk"; repo = "freetalk"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; - nativeBuildInputs = [ pkgconfig texinfo autoconf automake ]; + nativeBuildInputs = [ pkg-config texinfo autoconf automake ]; buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index 1344440eafc..a3df74a0016 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -36,7 +36,7 @@ , openldap , ortp , pango -, pkgconfig +, pkg-config , python , qtbase , qtgraphicaleffects @@ -125,7 +125,7 @@ mkDerivation rec { graphviz intltool makeWrapper - pkgconfig + pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 8e5642855a3..7c5bff94084 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr +{ lib, stdenv, fetchurl, openssl, ncurses, pkg-config, glib, loudmouth, libotr , gpgme }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; configureFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/mirage/default.nix b/pkgs/applications/networking/instant-messengers/mirage/default.nix index bcf3279d6a0..3b6b9bfc6f9 100644 --- a/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchFromGitHub -, qmake, pkgconfig, olm, wrapQtAppsHook +, qmake, pkg-config, olm, wrapQtAppsHook , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qttools, qtgraphicaleffects , python3Packages, pyotherside, libXScrnSaver }: @@ -23,7 +23,7 @@ mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig qmake wrapQtAppsHook python3Packages.wrapPython ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ]; buildInputs = [ qtbase qtmultimedia diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index a26d3c41b22..48adc6f03cf 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -19,7 +19,7 @@ , spdlog , fmt , olm -, pkgconfig +, pkg-config , nlohmann_json }: @@ -37,7 +37,7 @@ mkDerivation rec { nativeBuildInputs = [ lmdbxx cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 2bb347611b8..46f8458f153 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, libxml2, pidgin, pkgconfig, fetchFromGitHub } : +{ lib, stdenv, libxml2, pidgin, pkg-config, fetchFromGitHub } : stdenv.mkDerivation rec { pname = "pidgin-carbons"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxml2 pidgin ]; meta = with lib; { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 2127fe7ff5b..1250e3877b9 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: +{ lib, stdenv, fetchurl, pkg-config, pidgin, texLive, imagemagick, glib, gtk2 }: let version = "1.5.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "9c850aee90d7e59de834f83e09fa6e3e51b123f06e265ead70957608ada95441"; }; - nativeBuildInputs = [pkgconfig]; + nativeBuildInputs = [pkg-config]; buildInputs = [gtk2 glib pidgin]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix index b2a20319213..a168eb984c3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-mra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, pidgin } : +{ lib, stdenv, fetchgit, pkg-config, pidgin } : let version = "54b2992"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1adq57g11kw7bfpivyvfk3nlpjkc8raiw4bzn3gn4nx3m0wl99vw"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix index f72dd198b60..9af8b0aff77 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, glib, json-glib, nss, nspr +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, glib, json-glib, nss, nspr , libsecret } : @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ pidgin glib json-glib nss nspr libsecret diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix index 59afb8bd65b..d7c3c6cacab 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: stdenv.mkDerivation rec { pname = "pidgin-skypeweb"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot=$(echo */skypeweb) ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix index 8128d0af7b7..10cbcb6c1d2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-discord/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib }: stdenv.mkDerivation { pname = "purple-discord"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0dc344zh1v4yh9c8javcw5ylzwc1wpx0ih8bww8p8cjmhr8kcl32"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix index 75be98506ae..2862e4df796 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-matrix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : +{ lib, stdenv, fetchFromGitHub, pkg-config, pidgin, json-glib, glib, http-parser, sqlite, olm, libgcrypt } : stdenv.mkDerivation rec { pname = "purple-matrix-unstable"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "-O3" "-Wno-error" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin json-glib glib http-parser sqlite olm libgcrypt ]; makeFlags = [ diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix index 547cd2b1427..9f5f9a2bda1 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-slack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pidgin, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pidgin, pkg-config }: stdenv.mkDerivation { pname = "purple-slack-unstable"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1sksqshiwldd32k8jmiflp2pcax31ym6rypr4qa4v5vdn907g80m"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin ]; PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix index c53ad0e2b3f..6e14ee1a2b8 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus +{ lib, stdenv, fetchurl, pkg-config, pidgin, libnotify, gdk-pixbuf, glib, dbus , dbus-glib }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix index a5593624691..527af9ed98d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/telegram-purple/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkgconfig, pidgin, libwebp, libgcrypt, gettext } : +{ lib, stdenv, fetchgit, pkg-config, pidgin, libwebp, libgcrypt, gettext } : let version = "1.3.1"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pidgin libwebp libgcrypt gettext ]; preConfigure = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index c956864b83d..65b9c245a38 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtk2-x11 +{ stdenv, fetchurl, makeWrapper, pkg-config, gtk2, gtk2-x11 , gtkspell2, aspell , gst_all_1, startupnotification, gettext , perlPackages, libxml2, nss, nspr, farstream @@ -44,7 +44,7 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (stdenv.isDarwin) gtk2-x11); - propagatedBuildInputs = [ pkgconfig gettext ] + propagatedBuildInputs = [ pkg-config gettext ] ++ (with perlPackages; [ perl XMLParser ]) ++ (lib.optional (stdenv.isLinux) gtk2) ++ (lib.optional (stdenv.isDarwin) gtk2-x11); diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index 8dc70d6d792..df6e675fecb 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonApplication, fetchFromGitHub, pythonOlder -, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkgconfig, setuptools }: +, pytest, aiodns, slixmpp, pyinotify, potr, mpd2, cffi, pkg-config, setuptools }: buildPythonApplication rec { pname = "poezio"; version = "0.13.1"; @@ -8,7 +8,7 @@ buildPythonApplication rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ aiodns slixmpp pyinotify potr mpd2 cffi setuptools ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; src = fetchFromGitHub { owner = pname; diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 2ea7c9502c2..4c059cb20d8 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, +{ lib, stdenv, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkg-config, gtk3, gtkspell3, fetchgit }: let @@ -19,7 +19,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ trousers gtk3 gtkspell3 ] ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ lib.optionals gui [ wrapGAppsHook ]; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 4630a37781f..c373d23948b 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, openssl , glibcLocales, expect, ncurses, libotr, curl, readline, libuuid , cmocka, libmicrohttpd, expat, sqlite, libmesode, autoconf-archive @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ - autoreconfHook autoconf-archive glibcLocales pkgconfig + autoreconfHook autoconf-archive glibcLocales pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 322da86071c..2a234edaa08 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, makeDesktopItem +{ mkDerivation, lib, stdenv, fetchurl, pkg-config, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: @@ -27,7 +27,7 @@ mkDerivation rec { openssl protobuf ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)" diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 420ab1a53b3..bad54f455b0 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -2,7 +2,7 @@ , fetchgit , which , autoreconfHook -, pkgconfig +, pkg-config , automake , libtool , pjsip @@ -89,7 +89,7 @@ stdenv.mkDerivation { autoreconfHook automake libtool - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index b80d5128748..83cc80ccaf0 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl, pkgconfig, glib, ncurses +{ lib, stdenv, fetchurl, perl, pkg-config, glib, ncurses , enablePlugin ? false }: # Enabling the plugin and using it with a recent irssi, segafults on join: @@ -27,7 +27,7 @@ stdenv.mkDerivation { configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ perl glib ncurses ]; meta = { diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index 494a1f267f9..1dadc728eee 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, pkgconfig, qttools, sconsPackages +{ mkDerivation, lib, stdenv, fetchurl, pkg-config, qttools, sconsPackages , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: @@ -14,7 +14,7 @@ mkDerivation rec { patches = [ ./qt-5.11.patch ./scons.patch ]; - nativeBuildInputs = [ pkgconfig qttools sconsPackages.scons_3_1_2 ]; + nativeBuildInputs = [ pkg-config qttools sconsPackages.scons_3_1_2 ]; buildInputs = [ GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 8ea4362e7e3..20da2a65dc2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl, callPackage -, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo +, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 , tl-expected, hunspell @@ -41,7 +41,7 @@ in mkDerivation rec { dontWrapGApps = true; dontWrapQtApps = true; - nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; + nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ]; buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index b4a4e8df0f6..3fe88c287c5 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, libxslt, telepathy-glib, libxml2, dbus-glib, dbus +{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "174nlkqm055vrhv11gy73m20jbsggcb0ddi51c7s9m3j5ibr2p0i"; }; - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkg-config libxslt ]; buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; checkInputs = [ dbus.daemon ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index baa16c98e07..74e4d1039e7 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkgconfig, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; - nativeBuildInputs = [ pkgconfig libxslt ]; + nativeBuildInputs = [ pkg-config libxslt ]; patches = [ # Patch from Gentoo that helps telepathy-haze build with more diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 95be1b07375..bc66d77e224 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dconf, pkgconfig, dbus-glib, telepathy-glib, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) makeWrapper ]; preFixup = '' diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 336bde0bb48..bae29f4b31f 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkgconfig +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - makeWrapper pkgconfig intltool libxslt gobject-introspection + makeWrapper pkg-config intltool libxslt gobject-introspection ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index dc0a16139ea..cf166f7e2d3 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup -, libuuid, openssl, pcre, sqlite, pkgconfig }: +, libuuid, openssl, pcre, sqlite, pkg-config }: stdenv.mkDerivation rec { pname = "telepathy-salut"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl sqlite pcre telepathy-glib.python ]; - nativeBuildInputs = [ libxslt pkgconfig ]; + nativeBuildInputs = [ libxslt pkg-config ]; configureFlags = [ "--disable-avahi-tests" ]; diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index 51c05523160..e59e5864432 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, libsodium, ncurses, curl -, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus +, libtoxcore, openal, libvpx, freealut, libconfig, pkg-config, libopus , qrencode, gdk-pixbuf, libnotify }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!stdenv.isAarch32) [ openal libopus libvpx freealut qrencode ]; - nativeBuildInputs = [ pkgconfig libconfig ]; + nativeBuildInputs = [ pkg-config libconfig ]; meta = with lib; { description = "Reference CLI for Tox"; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 01f2b9c5644..668e614c474 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, check, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, check, cmake, pkg-config , libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l , libXrender, fontconfig, libXext, libXft, libsodium, libopus }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - cmake pkgconfig + cmake pkg-config ]; cmakeFlags = [ diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 19f398bc59a..2a91e3ebddc 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, gtk2, lua, perl, python3 , pciutils, dbus-glib, libcanberra-gtk2, libproxy , enchant2, libnotify, openssl, isocodes , desktop-file-utils @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "08kvp0dcn3bvmlqcfp9312075bwkqkpa8m7zybr88pfp210gfl85"; }; - nativeBuildInputs = [ meson ninja pkgconfig ]; + nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 9061ac34fe3..91617a26782 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { pname = "irssi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ncurses glib openssl perl libintl libgcrypt libotr ]; configureFlags = [ diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index 5c1c9743621..d3b814fb161 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkgconfig }: +{ lib, stdenv, fetchurl, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: stdenv.mkDerivation rec { name = "fish-irssi-20130413-e98156bebd"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp src/.libs/libfish.so $out/lib/irssi/modules ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gmp automake autoconf libtool openssl glib ]; meta = { diff --git a/pkgs/applications/networking/irc/kvirc/default.nix b/pkgs/applications/networking/irc/kvirc/default.nix index 6fd66096b5b..cfc03fe37d3 100644 --- a/pkgs/applications/networking/irc/kvirc/default.nix +++ b/pkgs/applications/networking/irc/kvirc/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , qtbase, qtmultimedia, qtsvg, qtx11extras -, pkgconfig, cmake, gettext +, pkg-config, cmake, gettext }: mkDerivation rec { @@ -19,7 +19,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig cmake gettext + pkg-config cmake gettext ]; meta = with lib; { diff --git a/pkgs/applications/networking/libcoap/default.nix b/pkgs/applications/networking/libcoap/default.nix index 188d19d5968..643941b5fa8 100644 --- a/pkgs/applications/networking/libcoap/default.nix +++ b/pkgs/applications/networking/libcoap/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, automake, autoconf, which, pkgconfig, libtool, lib, stdenv }: +{ fetchFromGitHub, automake, autoconf, which, pkg-config, libtool, lib, stdenv }: stdenv.mkDerivation rec { pname = "libcoap"; version = "4.2.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { autoconf which libtool - pkgconfig + pkg-config ]; preConfigure = "./autogen.sh"; configureFlags = [ diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index 2570e425ae7..2f9832d9193 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -15,7 +15,7 @@ , libnotify , libsecret , openssl -, pkgconfig +, pkg-config , webkitgtk , wrapGAppsHook }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config intltool gobject-introspection wrapGAppsHook diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 975ace086f5..b745a842b9f 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,7 +1,7 @@ { lib, config, fetchurl, stdenv, wrapGAppsHook, autoreconfHook , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, gumbo , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkgconfig, poppler, python, shared-mime-info +, openldap, perl, pkg-config, poppler, python, shared-mime-info , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical # Build options # TODO: A flag to build the manual. @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook python.pkgs.wrapPython ]; propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix index 3a828b631a3..d5223092446 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/gtk3.nix @@ -1,7 +1,7 @@ { lib, config, fetchgit, stdenv, wrapGAppsHook, autoreconfHook, bison, flex , curl, dbus, dbus-glib, enchant, gtk3, gnutls, gnupg, gpgme , libarchive, libcanberra-gtk3, libetpan, libnotify, libsoup, libxml2, networkmanager -, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk +, openldap, perl, pkg-config, poppler, python, shared-mime-info, webkitgtk , glib-networking, gsettings-desktop-schemas, libSM, libytnef, libical # Build options # TODO: A flag to build the manual. @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { --subst-var-by MIMEROOTDIR ${shared-mime-info}/share ''; - nativeBuildInputs = [ autoreconfHook bison flex pkgconfig wrapGAppsHook python.pkgs.wrapPython ]; + nativeBuildInputs = [ autoreconfHook bison flex pkg-config wrapGAppsHook python.pkgs.wrapPython ]; propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ]; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/hasmail/default.nix b/pkgs/applications/networking/mailreaders/hasmail/default.nix index a097fd0dd8a..b2ec2a743f3 100644 --- a/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, pkgconfig +, pkg-config , gobject-introspection , pango , cairo @@ -24,7 +24,7 @@ buildGoModule rec { doCheck = false; nativeBuildInputs = [ - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 0f1f2e52d85..878b778c5a5 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, lua, file, ncurses, gmime, pcre-cpp +{ lib, stdenv, fetchurl, pkg-config, lua, file, ncurses, gmime, pcre-cpp , perl, perlPackages, makeWrapper , debugBuild ? false , alternativeGlobalConfigFilePath ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ lua file ncurses gmime pcre-cpp perl perlPackages.JSON perlPackages.NetIMAPClient diff --git a/pkgs/applications/networking/mailreaders/meli/default.nix b/pkgs/applications/networking/mailreaders/meli/default.nix index 519448c3ade..2ced5e60db4 100644 --- a/pkgs/applications/networking/mailreaders/meli/default.nix +++ b/pkgs/applications/networking/mailreaders/meli/default.nix @@ -2,7 +2,7 @@ , lib , fetchgit , rustPlatform -, pkgconfig +, pkg-config , openssl , dbus , sqlite @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = lib.optional withNotmuch "--features=notmuch"; - nativeBuildInputs = [ pkgconfig gzip makeWrapper ]; + nativeBuildInputs = [ pkg-config gzip makeWrapper ]; buildInputs = [ openssl dbus sqlite ] ++ lib.optional withNotmuch notmuch; diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index 1f7bbf5c712..5c979bde604 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gettext, openssl }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { sha256 = "1623n0lvx42mamvb2vwin5i38hh0nxpxzmkr5188ss2x7m20lmii"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ openssl gettext ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index fcb92d3fcc1..64ebb78a12d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }: +{ lib, stdenv, fetchFromGitHub, pkg-config, glib, notmuch }: let version = "9"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "1j3zdx161i1x4w0nic14ix5i8hd501rb31daf8api0k8855sx4rc"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib notmuch ]; installPhase = "install -D notmuch-addrlookup $out/bin/notmuch-addrlookup"; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 59c7b6bf9d4..c39654d1c29 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchgit, lib, stdenv -, pkgconfig, gnupg +, pkg-config, gnupg , xapian, gmime, talloc, zlib , doxygen, perl, texinfo , pythonPackages @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config doxygen # (optional) api docs pythonPackages.sphinx # (optional) documentation -> doc/INSTALL texinfo # (optional) documentation -> doc/INSTALL diff --git a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix index de248faace7..fc8c83f216c 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, notmuch, openssl, pkgconfig, sqlite, xapian, zlib +, notmuch, openssl, pkg-config, sqlite, xapian, zlib }: stdenv.mkDerivation rec { version = "5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { url = "http://www.muchsync.org/src/${pname}-${version}.tar.gz"; sha256 = "1k2m44pj5i6vfhp9icdqs42chsp208llanc666p3d9nww8ngq2lb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ notmuch openssl sqlite xapian zlib ]; meta = { description = "Synchronize maildirs and notmuch databases"; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 1b6cc50ffdf..5caaa9ce6e1 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk2, openssl ? null, gpgme ? null +{ lib, stdenv, fetchurl, pkg-config, gtk2, openssl ? null, gpgme ? null , gpgSupport ? true, sslSupport ? true }: assert gpgSupport -> gpgme != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "0j9y5vdzch251s264diw9clrn88dn20bqqkwfmis9l7m8vmwasqd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 ] ++ optionals gpgSupport [ gpgme ] diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index ec26384261f..f3594d97801 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -37,7 +37,7 @@ , nss , pango , perl -, pkgconfig +, pkg-config , python2 , python3 , runtimeShell @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { nasm nodejs perl - pkgconfig + pkg-config python2 python3 rust-cbindgen diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ab4078d6a0d..e758249a71c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -38,7 +38,7 @@ , nss_3_53 , pango , perl -, pkgconfig +, pkg-config , python2 , python3 , runtimeShell @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { nasm nodejs perl - pkgconfig + pkg-config python2 python3 rust-cbindgen diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix index 51f6b4e0622..d7c7320b9e4 100644 --- a/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -10,7 +10,7 @@ , libsecret , mimetic , mkDerivation -, pkgconfig +, pkg-config , qgpgme , qtbase , qtkeychain @@ -59,7 +59,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config qttools gnupg ]; diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 2b4dabbedc5..da36589aeec 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, pkgconfig +, pkg-config , python3 , fetchFromGitLab , gtk3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config python3 perlPackages.Po4a itstool diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index bfc928cfbc6..42486458b2c 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -7,7 +7,7 @@ , libsecret , openssl , pcre -, pkgconfig +, pkg-config , qtbase , qtkeychain , qttools @@ -33,7 +33,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake ]; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 943947f389e..626913cd60a 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }: +{ lib, stdenv, fetchFromGitHub, libconfig, pkg-config, libevent, openssl }: stdenv.mkDerivation { pname = "nntp-proxy"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libconfig libevent openssl ]; installFlags = [ "INSTALL_DIR=$(out)/bin/" ]; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index a2d614ff542..40240565973 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -4,7 +4,7 @@ , meson , ninja , vala -, pkgconfig +, pkg-config , pantheon , python3 , glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meson ninja vala_0_40 - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/networking/qv2ray/default.nix b/pkgs/applications/networking/qv2ray/default.nix index fa8609ef532..7c3c23a89ee 100644 --- a/pkgs/applications/networking/qv2ray/default.nix +++ b/pkgs/applications/networking/qv2ray/default.nix @@ -8,7 +8,7 @@ , grpc , protobuf , openssl -, pkgconfig +, pkg-config , c-ares , abseil-cpp , libGL @@ -51,7 +51,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake clang - pkgconfig + pkg-config qmake qttools ]; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index fb0c0a18ac5..3e58e83143f 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools +{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, qtbase, qttools , seafile-shared, jansson, libsearpc , withShibboleth ? true, qtwebengine }: @@ -13,7 +13,7 @@ mkDerivation rec { sha256 = "2vV+6ZXjVg81JVLfWeD0UK+RdmpBxBU2Ozx790WFSyw="; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ qtbase qttools seafile-shared jansson libsearpc ] ++ lib.optional withShibboleth qtwebengine; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 1a9073056e7..4e83f36ea52 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, fribidi +{ lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl , boost, libxslt, goffice, wrapGAppsHook, gnome3 }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace 'enchant >=' 'enchant-2 >=' ''; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index aefa786d060..0e151f3adbe 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkgconfig, meson, ninja, python3, gtk3 +{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, gtk3 , desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index ea5ae8fb0a2..8ea277e1af3 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkgconfig, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee +{ lib, stdenv, fetchFromGitHub, pantheon, vala, python3, python2, pkg-config, libxml2, meson, ninja, gtk3, gnome3, glib, webkitgtk, libgee , gobject-introspection, sqlite, poppler, poppler_utils, html2text, curl, gnugrep, coreutils, bash, unzip, unar, wrapGAppsHook , appstream, desktop-file-utils }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { libxml2 meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index ff40d944c83..d49ee41c9f5 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config , desktop-file-utils , python3 , vala @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { desktop-file-utils meson ninja - pkgconfig + pkg-config python3 vala wrapGAppsHook diff --git a/pkgs/applications/office/envelope/default.nix b/pkgs/applications/office/envelope/default.nix index 6dc46d9dec6..7798026e790 100644 --- a/pkgs/applications/office/envelope/default.nix +++ b/pkgs/applications/office/envelope/default.nix @@ -4,7 +4,7 @@ , fetchpatch , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , vala @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meson ninja vala - pkgconfig + pkg-config python3 wrapGAppsHook ]; diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 594c95d3d95..808811e20e8 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , rustPlatform -, pkgconfig +, pkg-config , extra-cmake-modules , libX11 , libXi @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ extra-cmake-modules - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 2893271dc6f..6bca8f2e9e6 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, makeWrapper, cmake, gtest +{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest , boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales , webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi , libdbiDrivers, guile, perl, perlPackages @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "020k1mm909dcgs52ls4v7xx3yn8gqazi9awyr81l6y7pkq1spn2n"; }; - nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; + nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ]; buildInputs = [ boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index f52f9a3e909..4bf3081cde1 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,7 +1,7 @@ { fetchurl , lib, stdenv , gtk -, pkgconfig +, pkg-config , libgsf , libofx , intltool @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libgsf diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index a0df7144114..03c9445fe24 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook +{ fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook , libsoup, gnome3 }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "02wd569viwy6ncy0144z9nxr3zmpl4shkqhz7zzwyky4gknxf8lj"; }; - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libofx intltool libsoup gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix index 8a40a3f4f69..3b1700cc24f 100644 --- a/pkgs/applications/office/ktimetracker/default.nix +++ b/pkgs/applications/office/ktimetracker/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, cmake, pkgconfig, extra-cmake-modules, +{ mkDerivation, lib, fetchurl, cmake, pkg-config, extra-cmake-modules, kconfig, kconfigwidgets, kdbusaddons, kdoctools, ki18n, kidletime, kjobwidgets, kio, knotifications, kwindowsystem, kxmlgui, ktextwidgets, kcalendarcore @@ -14,11 +14,11 @@ mkDerivation rec { }; nativeBuildInputs = [ - cmake pkgconfig extra-cmake-modules + cmake pkg-config extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons kdoctools ki18n kidletime kjobwidgets + kconfig kconfigwidgets kdbusaddons kdoctools ki18n kidletime kjobwidgets kio knotifications kwindowsystem kxmlgui ktextwidgets kcalendarcore ]; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 6d8983179dc..7b3e630233f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -8,7 +8,7 @@ , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, clucene_core, libcdr, lcms , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, bluez5, libtool, carlito +, fontsConf, pkg-config, bluez5, libtool, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook @@ -386,7 +386,7 @@ in (mkDrv rec { ''; nativeBuildInputs = [ - gdb fontforge autoconf automake bison pkgconfig libtool + gdb fontforge autoconf automake bison pkg-config libtool ] ++ lib.optional (!kdeIntegration) wrapGAppsHook ++ lib.optional kdeIntegration wrapQtAppsHook; @@ -399,7 +399,7 @@ in (mkDrv rec { libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU libGL mythes glib libmysqlclient - neon nspr nss openldap openssl pam perl pkgconfig poppler + neon nspr nss openldap openssl pam perl pkg-config poppler python3 sane-backends unzip which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index a7aceb1e1cf..7ab5bc838ec 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , nix-update-script , pantheon -, pkgconfig +, pkg-config , vala_0_46 , cmake , ninja @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ninja # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349 vala_0_46 - pkgconfig + pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 3513e44ed0c..77cc087c66b 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk3, libxml2, gettext, libical, libnotify +{ lib, stdenv, fetchurl, pkg-config, gtk3, libxml2, gettext, libical, libnotify , libarchive, gspell, webkitgtk, libgringotts, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "19h3dnjgqbawnvgnycyp4n5b6mjsp5zghn3b69b6f3xa3fyi32qy"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ gtk3 libxml2 libical libnotify libarchive gspell webkitgtk libgringotts ]; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 6326df87ed2..b6d0d373f35 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst +{ fetchurl, lib, stdenv, pkg-config, autoconf, automake, clutter, clutter-gst , gdk-pixbuf, cairo, clutter-gtk }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "http://ftp.gnome.org/pub/GNOME/sources/pinpoint/0.1/${pname}-${version}.tar.xz"; sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf cairo clutter-gtk ]; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index dab567db898..0df6070319d 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, pkgconfig +, pkg-config , intltool , automake111x , autoconf @@ -25,7 +25,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = with gnome2; [ - pkgconfig + pkg-config intltool automake111x autoconf diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index 88212b7d8d9..a6427d0f890 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 +{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 , libart_lgpl, qt4, python2, cups, fontconfig, libjpeg , zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = with xorg; [ freetype lcms libtiff libxml2 libart_lgpl qt4 pythonEnv cups fontconfig diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index 8745dd37c98..7f4054bfb4e 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -14,7 +14,7 @@ , libxml2 , mkDerivation , pixman -, pkgconfig +, pkg-config , podofo , poppler , poppler_data @@ -45,7 +45,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index f40bc44e6eb..28e35d08e91 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -9,7 +9,7 @@ , gettext , ninja , pantheon -, pkgconfig +, pkg-config , json-glib , libgudev , libevdev @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cmake gettext ninja - pkgconfig + pkg-config vala wrapGAppsHook ]; diff --git a/pkgs/applications/office/timetable/default.nix b/pkgs/applications/office/timetable/default.nix index fa70fdd3082..9c9df892a04 100644 --- a/pkgs/applications/office/timetable/default.nix +++ b/pkgs/applications/office/timetable/default.nix @@ -8,7 +8,7 @@ , libgee , meson , ninja -, pkgconfig +, pkg-config , pantheon , python3 , wrapGAppsHook @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config vala python3 wrapGAppsHook diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 64091d7b50a..6b49a27a08a 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , python3Packages -, pkgconfig +, pkg-config , librsvg , gobject-introspection , atk @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config gobject-introspection wrapGAppsHook ]; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index b5589fcbdeb..0b086160e50 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ lib, stdenv, fetchFromGitHub, pkg-config, makeWrapper , lua52Packages, libXft, ncurses, ninja, readline, zlib }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { dontConfigure = true; nativeBuildInputs = [ - pkgconfig + pkg-config makeWrapper ninja ]; diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index f006eeb6756..6299fe21d29 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, cmake , pkgconfig, libusb1 +, cmake , pkg-config, libusb1 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libusb1 ]; cmakeFlags = diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 8ba372e46fb..7e346bcbf84 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, cmake, fftw, hamlib, libpulseaudio, libGL, libX11, liquid-dsp, - pkgconfig, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: + pkg-config, soapysdr-with-plugins, wxGTK31-gtk3, enableDigitalLab ? false }: stdenv.mkDerivation rec { pname = "cubicsdr"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ fftw hamlib libpulseaudio libGL libX11 liquid-dsp soapysdr-with-plugins wxGTK31-gtk3 ]; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index 0fb7317428e..e74cc551d49 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , mpg123, SDL2, gnome3, faad2, pcre } : @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 mpg123 SDL2 gnome3.gtkmm pcre ]; diff --git a/pkgs/applications/radio/dabtools/default.nix b/pkgs/applications/radio/dabtools/default.nix index 04d1e6056de..a288d93b40a 100644 --- a/pkgs/applications/radio/dabtools/default.nix +++ b/pkgs/applications/radio/dabtools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libusb1, rtl-sdr, fftw } : @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "18nkdybgg2w6zh56g6xwmg49sifalvraz4rynw8w5d8cqi3dm9sm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr fftw libusb1 ]; meta = with lib; { diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index f97ffb4d807..65afdccf812 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , libbladeRF , libusb1 , ncurses @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1zacsqaqsiapljhzw31dwc4nld2rp98jm3ivkyznrhzk9n156p42"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libbladeRF diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 349999b1eef..51728bfb403 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, hamlib, fltk14, libjpeg, libpng, portaudio, libsndfile, - libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: + libsamplerate, libpulseaudio, libXinerama, gettext, pkg-config, alsaLib }: stdenv.mkDerivation rec { version = "4.1.17"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio - libsndfile libsamplerate libpulseaudio pkgconfig alsaLib ]; + libsndfile libsamplerate libpulseaudio pkg-config alsaLib ]; meta = { description = "Digital modem program"; diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index 270494110d7..b0983c811e1 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index bbde8555547..0f75f704af3 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 36b0b216598..276581d80e5 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index f0f16f1e8c9..7471d6676ed 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -3,7 +3,7 @@ , fetchurl , fltk13 , libjpeg -, pkgconfig +, pkg-config }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config ]; meta = { diff --git a/pkgs/applications/radio/gnuradio/3.7.nix b/pkgs/applications/radio/gnuradio/3.7.nix index 76cfa5f414b..a8f96fac44a 100644 --- a/pkgs/applications/radio/gnuradio/3.7.nix +++ b/pkgs/applications/radio/gnuradio/3.7.nix @@ -4,7 +4,7 @@ , cmake # Remove gcc and python references , removeReferencesTo -, pkgconfig +, pkg-config , cppunit , swig , orc @@ -53,7 +53,7 @@ let basic = { native = [ cmake - pkgconfig + pkg-config orc ]; runtime = [ boost log4cpp mpir ]; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index 0bc8675690f..e99a1bfd7a1 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -4,7 +4,7 @@ , cmake # Remove gcc and python references , removeReferencesTo -, pkgconfig +, pkg-config , cppunit , swig , orc @@ -53,7 +53,7 @@ let basic = { native = [ cmake - pkgconfig + pkg-config orc ]; runtime = [ diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index a01fab4975a..afe3de64527 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, boost, gnuradio , pythonSupport ? true, python, swig, limesuite, log4cpp } : @@ -20,7 +20,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ] ++ lib.optionals pythonSupport [ swig ]; buildInputs = [ diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 41df55a890d..98dce802c5c 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libusb1, fftwSinglePrec }: stdenv.mkDerivation rec { pname = "hackrf"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index cf4ddd5b6e8..37131a686b5 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -1,7 +1,7 @@ { lib , mkDerivation , fetchFromGitHub -, pkgconfig +, pkg-config , cmake , boost , fftwFloat @@ -22,7 +22,7 @@ mkDerivation rec { sha256 = "1x6nyn429pk0f7lqzskrgsbq09mq5787xd4piic95add6n1cc355"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; buildInputs = [ fftwFloat boost diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index dc6b1325cf1..5792031c802 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fftw, hackrf, libusb1 }: stdenv.mkDerivation { name = "kalibrate-hackrf-unstable-20160827"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "1jvn1qx7csgycxpx1k804sm9gk5a0c65z9gh8ybp9awq3pziv0nx"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw hackrf libusb1 ]; diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 536e83297c3..255938b11d5 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, fftw, rtl-sdr, libusb1 }: +{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, fftw, rtl-sdr, libusb1 }: stdenv.mkDerivation { name = "kalibrate-rtl-20131214"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1spbfflkqnw9s8317ppsf7b1nnkicqsmaqsnz1zf8i49ix70i6kn"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fftw rtl-sdr libusb1 ]; meta = with lib; { diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index 0b0f8f2f0cc..48068a342e2 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, libtool +{ lib, stdenv, fetchFromGitHub, pkg-config, autoconf, automake, libtool , fftw, fftwSinglePrec, alsaLib, libsndfile, libpulseaudio }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1b5xy36fjcp7vkp115dpx4mlmqg2fc7xvxdy648fb8im953bw7ql"; }; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ pkg-config autoconf automake libtool ]; buildInputs = [ fftw fftwSinglePrec alsaLib libsndfile libpulseaudio ]; preConfigure = '' diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index 2e333e462c6..d92cf9e25cd 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkgconfig, fftw, +{ mkDerivation, lib, stdenv, fetchurl, qtbase, qmake, openjpeg, pkg-config, fftw, libpulseaudio, alsaLib, hamlib, libv4l, fftwFloat }: mkDerivation rec { @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config ]; buildInputs = [ qtbase openjpeg fftw libpulseaudio alsaLib hamlib libv4l diff --git a/pkgs/applications/radio/rtl-ais/default.nix b/pkgs/applications/radio/rtl-ais/default.nix index 9f917329168..7fd37d21fe1 100644 --- a/pkgs/applications/radio/rtl-ais/default.nix +++ b/pkgs/applications/radio/rtl-ais/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, rtl-sdr }: +{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, rtl-sdr }: stdenv.mkDerivation { name = "rtl-ais"; version = "0.8.1"; - buildInputs = [ pkgconfig rtl-sdr libusb1 ]; + buildInputs = [ pkg-config rtl-sdr libusb1 ]; src = fetchFromGitHub { owner = "dgiardini"; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 0b5381fb601..2fe57eaf296 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, fetchpatch, cmake, pkgconfig, libusb1 }: +{ lib, stdenv, fetchgit, fetchpatch, cmake, pkg-config, libusb1 }: stdenv.mkDerivation rec { pname = "rtl-sdr"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "0ns740s2rys4glq4la4bh0sxfv1mn61yfjns2yllhx70rsb2fqrn"; }) ]; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 ]; # TODO: get these fixes upstream: diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 6f4460e6d6e..b926e29bc47 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libusb1, rtl-sdr, soapysdr-with-plugins }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "093bxjxkg7yf78wqj5gpijbfa2p05ny09qqsj84kzi1svnzsa369"; }; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libusb1 rtl-sdr soapysdr-with-plugins ]; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 96f6df2744b..b4a6cb775cc 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -19,7 +19,7 @@ libbladeRF, mkDerivation, ocl-icd, opencv3, -pkgconfig, +pkg-config, qtbase, qtmultimedia, qtserialport, @@ -42,7 +42,7 @@ mkDerivation rec { fetchSubmodules = false; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ glew opencv3 libusb1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index db9ad67ad40..9c0ad38eb59 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , libbladeRF, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "02wh09850vinqg248fw4lxmx7y857cqmnnb8jm9zhyrsggal0hki"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ libbladeRF soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 105f0f423f4..8fe3dc90008 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , hackrf, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ hackrf soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 4be9e20d1f5..855213fc514 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config , rtl-sdr, soapysdr } : @@ -16,7 +16,7 @@ in stdenv.mkDerivation { sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ rtl-sdr soapysdr ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 87f69377c62..ea8c8fad106 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake -, libusb-compat-0_1, pkgconfig +, libusb-compat-0_1, pkg-config , usePython ? false , python, ncurses, swig2 , extraPackages ? [] @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "102wnpjxrwba20pzdh1vvx0yg1h8vqd8z914idxflg9p14r6v5am"; }; - nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; diff --git a/pkgs/applications/radio/svxlink/default.nix b/pkgs/applications/radio/svxlink/default.nix index f2688db4ad1..19e635da5ac 100644 --- a/pkgs/applications/radio/svxlink/default.nix +++ b/pkgs/applications/radio/svxlink/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, cmake, pkgconfig, fetchFromGitHub, makeDesktopItem, alsaLib, speex +{ lib, stdenv, cmake, pkg-config, fetchFromGitHub, makeDesktopItem, alsaLib, speex , libopus, curl, gsm, libgcrypt, libsigcxx, popt, qtbase, qttools , wrapQtAppsHook, rtl-sdr, tcl, doxygen, groff }: @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { ]; dontWrapQtApps = true; - nativeBuildInputs = [ cmake pkgconfig doxygen groff wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config doxygen groff wrapQtAppsHook ]; buildInputs = [ alsaLib diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index a9fd0102dd1..91a07496ce9 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkgconfig, glib +{ lib, stdenv, fetchFromGitHub, autoreconfHook, autoconf, automake, pkg-config, glib , perl, ncurses5, hamlib, xmlrpc_c }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj"; }; - nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; + nativeBuildInputs = [ autoreconfHook autoconf automake pkg-config perl ]; buildInputs = [ glib ncurses5 hamlib xmlrpc_c ]; configureFlags = [ "--enable-hamlib" "--enable-fldigi-xmlrpc" ]; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 4645ae881a8..bafb2f637df 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchFromGitHub , cmake -, pkgconfig +, pkg-config # See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations , boost , enableLibuhd_C_api ? true @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - pkgconfig + pkg-config ] # If both enableLibuhd_Python_api and enableUtils are off, we don't need # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime diff --git a/pkgs/applications/radio/unixcw/default.nix b/pkgs/applications/radio/unixcw/default.nix index ec449517fcf..5e299cc5984 100644 --- a/pkgs/applications/radio/unixcw/default.nix +++ b/pkgs/applications/radio/unixcw/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkgconfig, qt5}: +{lib, stdenv, fetchurl, libpulseaudio, alsaLib , pkg-config, qt5}: stdenv.mkDerivation rec { pname = "unixcw"; version = "3.5.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ ./remove-use-of-dlopen.patch ]; - buildInputs = [libpulseaudio alsaLib pkgconfig qt5.qtbase]; + buildInputs = [libpulseaudio alsaLib pkg-config qt5.qtbase]; CFLAGS ="-lasound -lpulse-simple"; meta = with lib; { diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 87c04dd3b98..be154d6cee3 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2, qtgraphicaleffects , faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let @@ -17,7 +17,7 @@ in mkDerivation { sha256 = "04fpm6sc431dl9i5h53xpd6k85j22sv8aawl7b6wv2fzpfsd9fwa"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ faad2 diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index debbaf0606f..697a28e4be9 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; # Hamlib builds with autotools, wsjtx builds with cmake - # Omitting pkgconfig because it causes issues locating the built hamlib + # Omitting pkg-config because it causes issues locating the built hamlib nativeBuildInputs = [ asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool qttools texinfo wrapQtAppsHook diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 04797140b02..eb57048c5c2 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk2, pkgconfig, hamlib }: +{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, hamlib }: stdenv.mkDerivation rec { pname = "xlog"; version = "2.0.19"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # glib-2.62 deprecations NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS"; - buildInputs = [ glib pkgconfig gtk2 hamlib ]; + buildInputs = [ glib pkg-config gtk2 hamlib ]; meta = with lib; { description = "An amateur radio logging program"; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 8c8a0c1c3f6..da3c25def3f 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkgconfig +{ stdenv, lib, fetchurl, cmake, pkg-config , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = - [ yasm cmake pkgconfig ] + [ yasm cmake pkg-config ] ++ lib.optional withQT wrapQtAppsHook; buildInputs = [ zlib gettext libvdpau libva libXv sqlite fribidi fontconfig diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index f326965ce44..3fd25bdf73d 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , cairo, ffmpeg_3, ffms, libjpeg, log4cpp, pango , avxeditSupport ? false, qt4 ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation { "--with-jpeg=${libjpeg.out}/lib" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cairo ffmpeg_3 ffms libjpeg log4cpp pango ] ++ optional avxeditSupport qt4; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index 4554bea6157..2a732ffa184 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, pkgconfig, ffmpeg, glew, libass, openal, qtbase }: +{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg, glew, libass, openal, qtbase }: mkDerivation rec { pname = "bino"; @@ -9,7 +9,7 @@ mkDerivation rec { sha256 = "04yl7ibnhajlli4a5x77az8jxbzw6b2wjay8aa6px551nmiszn9k"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ ffmpeg glew libass openal qtbase ]; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 7e366da4378..8d6df2c4904 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, pkgconfig +, pkg-config , fetchpatch , scons , boost @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { {name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";} ]); - nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; + nativeBuildInputs = [ wrapGAppsHook scons pkg-config gettext ]; buildInputs = [ boost diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 705bac06eb6..69d27c3a2c8 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix index bc2ac4e4ef2..881e6b687ef 100644 --- a/pkgs/applications/video/ccextractor/default.nix +++ b/pkgs/applications/video/ccextractor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake , glew, glfw3, leptonica, libiconv, tesseract3, zlib }: with lib; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sourceRoot = "source/src"; - nativeBuildInputs = [ pkgconfig cmake ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ lib.optional (!stdenv.isLinux) libiconv; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index b59a40c03a2..57eaf91f2ae 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -5,7 +5,7 @@ , ninja , python3 , gettext -, pkgconfig +, pkg-config , desktop-file-utils , wrapGAppsHook , appstream-glib @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { python3 appstream-glib gettext - pkgconfig + pkg-config desktop-file-utils wrapGAppsHook ]; diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 8d6ff8e5a00..bfc577e51a2 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 +, pkg-config, faad2, faac, a52dec, alsaLib, fftw, lame, libavc1394 , libiec61883, libraw1394, libsndfile, libvorbis, libogg, libjpeg , libtiff, freetype, mjpegtools, x264, gettext, openexr , libXext, libXxf86vm, libXv, libXi, libX11, libXft, xorgproto, libtheora, libpng @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ automake - autoconf libtool pkgconfig file + autoconf libtool pkg-config file faad2 faac a52dec alsaLib fftw lame libavc1394 libiec61883 libraw1394 libsndfile libvorbis libogg libjpeg libtiff freetype diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index 5afcab12a08..09289840030 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 +{ lib, stdenv, fetchurl, pkg-config, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { cp ${automake}/share/automake-*/mkinstalldirs . ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 6ea3a53a0af..502c4c69c3f 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig +{ lib, stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkg-config , flex, bison }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; patches = [ ./dvdauthor-0.7.1-automake-1.13.patch diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 8ca3be19e5a..6366a222722 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig +{ lib, stdenv, fetchurl, pkg-config , flex, bison, gettext , xineUI, wxSVG , fontconfig @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkgconfig ]; + [ pkg-config ]; packagesToBinPath = [ cdrtools dvdauthor dvdplusrwtools ]; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 88dfe5b4b87..de56865410e 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, substituteAll, fetchFromGitHub, pkgconfig, gettext, glib, gtk3, gmtk, dbus, dbus-glib +{lib, stdenv, substituteAll, fetchFromGitHub, pkg-config, gettext, glib, gtk3, gmtk, dbus, dbus-glib , libnotify, libpulseaudio, mplayer, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0qvy9fllvg1mad6y1j79iaqa6khs0q2cb0z62yfg4srbr07fi8xr"; }; - nativeBuildInputs = [ pkgconfig gettext wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ]; buildInputs = [ glib gtk3 gmtk dbus dbus-glib libnotify libpulseaudio ]; patches = [ diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 906d119dfc5..6597b5fbffe 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, zlib }: stdenv.mkDerivation rec { version = "1.0.1"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # this is the bare minimum configuration, as I'm only interested in MP4Box # For most other functionality, this should probably be extended - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 16db55f060d..6317d7b1ab3 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -9,7 +9,7 @@ { stdenv, lib, fetchFromGitHub, # Main build tools - pkgconfig, autoconf, automake, libtool, m4, lzma, python3, + pkg-config, autoconf, automake, libtool, m4, lzma, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -93,7 +93,7 @@ _EOF ''); nativeBuildInputs = [ - pkgconfig autoconf automake libtool m4 python3 + pkg-config autoconf automake libtool m4 python3 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 13beb768d7b..5f12dd6494b 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -51,7 +51,7 @@ #AMR-WB IF2 support no { lib, stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv -, pkgconfig, perlPackages, libavc1394, libiec61883, libXv, gettext +, pkg-config, perlPackages, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -64,7 +64,7 @@ stdenv.mkDerivation { }; buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages + pkg-config libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ] # TODOoptional packages ++ (with perlPackages; [ perl XMLParser ]); configureFlags = [ "--enable-local-ffmpeg=no" ]; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 4726c1b7b51..3aaa465a3cc 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchpatch, fetchurl, fetchFromGitHub, autoconf, automake, libtool, makeWrapper, linuxHeaders -, pkgconfig, cmake, gnumake, yasm, python2Packages +, pkg-config, cmake, gnumake, yasm, python2Packages , libgcrypt, libgpgerror, libunistring , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which @@ -99,11 +99,11 @@ let "-DCROSSCOMPILING=ON" "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" - "-DPKG_CONFIG_EXECUTABLE=pkgconfig" + "-DPKG_CONFIG_EXECUTABLE=pkg-config" ]; buildInputs = [ libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkgconfig gnutls ]; + nativeBuildInputs = [ cmake nasm pkg-config gnutls ]; }; # We can build these externally but FindLibDvd.cmake forces us to build it @@ -114,7 +114,7 @@ let rev = "${version}-${rel}-Beta-5"; sha256 = "0j41ydzx0imaix069s3z07xqw9q95k7llh06fc27dcn6f7b8ydyl"; buildInputs = [ linuxHeaders ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' rm -rf msvc @@ -133,7 +133,7 @@ let rev = "${version}-${rel}-Alpha-3"; sha256 = "0qwlf4lgahxqxk1r2pzl866mi03pbp7l1fc0rk522sc0ak2s9jhb"; buildInputs = [ libdvdcss libdvdread ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; postPatch = cmakeProtoPatch; postInstall = '' mv $out/lib/liblibdvdnav.so $out/lib/libdvdnav.so @@ -146,7 +146,7 @@ let rev = "${version}-${rel}-Alpha-3"; sha256 = "1xxn01mhkdnp10cqdr357wx77vyzfb5glqpqyg8m0skyi75aii59"; buildInputs = [ libdvdcss ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; configureFlags = [ "--with-libdvdcss" ]; postPatch = cmakeProtoPatch; }; @@ -208,7 +208,7 @@ in stdenv.mkDerivation { doxygen makeWrapper which - pkgconfig gnumake + pkg-config gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 jre_headless yasm gettext python2Packages.python flatbuffers diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index 365fb1ea417..ad9a77af080 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchgit, pkgconfig, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: +{ mkDerivation, lib, fetchgit, pkg-config, qmake, qtbase, qttools, qtmultimedia, libvorbis, libtar, libxml2 }: mkDerivation rec { version = "0.8.5"; @@ -10,7 +10,7 @@ mkDerivation rec { sha256 = "1612lkwsfzc59wvdj2zbj5cwsyw66bwn31jrzjrxvygxdh4ab069"; }; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ qtbase qttools qtmultimedia libvorbis libtar libxml2 ]; postPatch = '' diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index 284cc4ae58a..6bca33eb388 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -6,7 +6,7 @@ , liblo , gst_all_1 , qmake -, pkgconfig +, pkg-config , wrapQtAppsHook }: @@ -26,7 +26,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config wrapQtAppsHook ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 3fed91bd961..5735771b5d3 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv, drake +{ lib, stdenv, fetchFromGitLab, pkg-config, autoconf, automake, libiconv, drake , ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost, libebml, zlib , fmt, libmatroska, libogg, libvorbis, flac, libxslt, cmark, pcre2 , withGUI ? true @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig autoconf automake gettext + pkg-config autoconf automake gettext drake ruby docbook_xsl libxslt ]; diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index b3732647162..53db96e31d4 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config , ffmpeg, libjpeg, libmicrohttpd }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ ffmpeg libjpeg libmicrohttpd ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 757aa42682a..4e245b70d4f 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkgconfig, freetype, yasm, ffmpeg_3 +{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg_3 , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ pkgconfig yasm ]; + nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; [ freetype ffmpeg_3 ] ++ optional aalibSupport aalib diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 05025cb304f..d4fc07d1a2e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchFromGitHub, fetchpatch -, addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which +, addOpenGLRunpath, docutils, perl, pkg-config, python3, wafHook, which , ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null , CoreFoundation, Cocoa, CoreAudio, MediaPlayer @@ -152,7 +152,7 @@ in stdenv.mkDerivation rec { ++ lib.optional (!swiftSupport) "--disable-macos-cocoa-cb"; nativeBuildInputs = [ - addOpenGLRunpath docutils perl pkgconfig python3 wafHook which + addOpenGLRunpath docutils perl pkg-config python3 wafHook which ] ++ optional swiftSupport swift; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 020c38c8b57..1b5404fede1 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv-unwrapped }: +{ lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, glib, mpv-unwrapped }: stdenv.mkDerivation rec { pname = "mpv-mpris"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib mpv-unwrapped ]; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 5a789654644..bd8eb26895c 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, mkDerivation, fetchFromGitHub, which, qtbase, qtwebkit, qtscript, xlibsWrapper , libpulseaudio, fftwSinglePrec , lame, zlib, libGLU, libGL, alsaLib, freetype -, perl, pkgconfig , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm +, perl, pkg-config , libsamplerate, libbluray, lzo, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm , libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file, exiv2, linuxHeaders }: @@ -27,9 +27,9 @@ mkDerivation rec { perl libsamplerate libbluray lzo alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib exiv2 ]; - nativeBuildInputs = [ pkgconfig which yasm libtool autoconf automake file ]; + nativeBuildInputs = [ pkg-config which yasm libtool autoconf automake file ]; - configureFlags = + configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; meta = with lib; { diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index c9486edd250..a455869ebf9 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, +{ lib, stdenv, fetchurl, qt4, pkg-config, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, poppler, imagemagick, openexr, ffmpeg_3, opencolorio, openimageio, qmake4Hook, libpng, libGL, lndir }: @@ -50,7 +50,7 @@ let ({ pluginName = "arena"; sha256 = "0qba13vn9qdfax7nqlz1ps27zspr5kh795jp1xvbmwjzjzjpkqkf"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pango librsvg librevenge libcdr opencolorio libxml2 libzip poppler imagemagick @@ -66,7 +66,7 @@ let ({ pluginName = "io"; sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng ffmpeg_3 openexr opencolorio openimageio boost libGL seexpr @@ -93,7 +93,7 @@ stdenv.mkDerivation { sha256 = "1wdc0zqriw2jhlrhzs6af3kagrv22cm086ffnbr1x43mgc9hfhjp"; }; - nativeBuildInputs = [ qmake4Hook pkgconfig python2Packages.wrapPython ]; + nativeBuildInputs = [ qmake4Hook pkg-config python2Packages.wrapPython ]; buildInputs = [ qt4 boost expat cairo python2Packages.pyside python2Packages.pysideShiboken diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index af4e11ef0dd..f0722b52532 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -19,7 +19,7 @@ , curl , xorg , makeWrapper -, pkgconfig +, pkg-config , libvlc , mbedtls @@ -50,7 +50,7 @@ in mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkg-config ]; buildInputs = [ curl diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index eba1508387b..47f6ea9e5dd 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -6,7 +6,7 @@ # mkdir -p ~/.config/obs-studio/plugins/wlrobs/bin/64bit # ln -s ~/.nix-profile/share/obs/obs-plugins/wlrobs/bin/64bit/libwlrobs.so ~/.config/obs-studio/plugins/wlrobs/bin/64bit { stdenv, fetchhg, wayland, obs-studio -, meson, ninja, pkgconfig, libX11 +, meson, ninja, pkg-config, libX11 , dmabufSupport ? false, libdrm ? null, libGL ? null, lib}: assert dmabufSupport -> libdrm != null && libGL != null; @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "0qrcf8024r4ynfjw0zx8vn59ygx9q5rb196s6nyxmy3gkv2lfxlq"; }; - buildInputs = [ libX11 libGL libdrm meson ninja pkgconfig wayland obs-studio ]; + buildInputs = [ libX11 libGL libdrm meson ninja pkg-config wayland obs-studio ]; installPhase = '' mkdir -p $out/share/obs/obs-plugins/wlrobs/bin/64bit diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 65f032c078c..7bacf4138c1 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, which, qmake, mkDerivation, +{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation, qtmultimedia, wrapQtAppsHook, frei0r, opencolorio, ffmpeg-full, CoreFoundation }: @@ -14,7 +14,7 @@ mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config which qmake wrapQtAppsHook diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index d769eaa5955..84f5ac56e7d 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, doxygen +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, doxygen , alsaLib, libX11, libXft, libXrandr, libXinerama, libXext, libXcursor , zlib, AGL, Cocoa, Foundation }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ pkgconfig cmake doxygen ]; + [ pkg-config cmake doxygen ]; buildInputs = optionals stdenv.isLinux [ alsaLib ] diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index e66c519f78b..2070d05d980 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchpatch -, pkgconfig, cmake, doxygen +, pkg-config, cmake, doxygen , libopenshot-audio, imagemagick, ffmpeg_3 , swig, python3 , unittest-cpp, cppzmq, zeromq @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { export _REL_PYTHON_MODULE_PATH=$(toPythonPath $out) ''; - nativeBuildInputs = [ pkgconfig cmake doxygen ]; + nativeBuildInputs = [ pkg-config cmake doxygen ]; buildInputs = [ imagemagick ffmpeg_3 swig python3 unittest-cpp diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 64f7b7181ee..35dceddf224 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,9 +1,9 @@ -{ lib, stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: +{ lib, stdenv, pkg-config, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ opencv2 ncurses portaudio ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index d81c32de20c..2a1418cb373 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -6,7 +6,7 @@ , gettext , desktop-file-utils , appstream-glib -, pkgconfig +, pkg-config , txt2man , gzip , vala @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meson ninja libxml2 - pkgconfig + pkg-config txt2man python3 vala diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 5f7f62a409b..e690c507024 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, pkgconfig, cmake, python3, mkDerivation +{ lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, cmake, python3, mkDerivation , libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras , libvdpau, SDL2, mpv, libGL }: let @@ -21,7 +21,7 @@ in mkDerivation rec { sha256 = "XFwcSHn9wG30bDMGFITBmhp6/VI1RLmxMxFFxjntTmw="; }; - nativeBuildInputs = [ pkgconfig cmake python3 ]; + nativeBuildInputs = [ pkg-config cmake python3 ]; buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras libvdpau SDL2 mpv libGL ]; diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 0de021a82a1..b05fa113a30 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: +{ mkDerivation, lib, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkg-config }: mkDerivation rec { pname = "QMediathekView"; @@ -18,7 +18,7 @@ mkDerivation rec { buildInputs = [ qtbase qttools xz boost ]; - nativeBuildInputs = [ qmake pkgconfig ]; + nativeBuildInputs = [ qmake pkg-config ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index b37d65d8ffc..53b46ceeb07 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -12,7 +12,7 @@ , ninja , libxml2 , gettext -, pkgconfig +, pkg-config , libgphoto2 , gphoto2 , v4l-utils @@ -46,7 +46,7 @@ mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig + pkg-config cmake extra-cmake-modules ninja diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 37486dfa114..071e67a1721 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: +{ lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }: stdenv.mkDerivation rec { pname = "libquvi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ]; meta = { diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index d91ac4526d1..676d073900c 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig}: +{lib, stdenv, fetchurl, pkg-config}: stdenv.mkDerivation rec { pname = "quvi-scripts"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; meta = { description = "Web video downloader"; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index e7a5153f710..6718fc1dc36 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: +{lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}: stdenv.mkDerivation rec { pname = "quvi"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ lua5 curl quvi_scripts libquvi glib makeWrapper ]; postInstall = '' wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua" diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 160a9957456..ade4b61931b 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,7 +8,7 @@ , gettext , mlt , jack1 -, pkgconfig +, pkg-config , qtbase , qtmultimedia , qtx11extras @@ -35,7 +35,7 @@ mkDerivation rec { }; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ SDL2 frei0r diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b42e1412152..939ae7c4440 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras -, libXfixes, libGLU, libGL, pkgconfig, libpulseaudio, qtbase, cmake, ninja +, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, qtbase, cmake, ninja }: mkDerivation rec { @@ -23,7 +23,7 @@ mkDerivation rec { done ''; - nativeBuildInputs = [ pkgconfig cmake ninja ]; + nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ alsaLib ffmpeg_3 libjack2 libX11 libXext libXfixes libGLU libGL libpulseaudio qtbase qtx11extras diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 67918ee9806..3dfd9d4b09b 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, intltool, file, +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, intltool, file, desktop-file-utils, enchant, gtk3, gtkmm3, gst_all_1, hicolor-icon-theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook - pkgconfig + pkg-config intltool file wrapGAppsHook diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 16aa2a3e6a5..eeb61624409 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig +{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkg-config , gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true @@ -28,7 +28,7 @@ nativeBuildInputs = [ perl ]; # plugins uses the same build environment as vdr - propagatedNativeBuildInputs = [ pkgconfig gettext ]; + propagatedNativeBuildInputs = [ pkg-config gettext ]; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 9c49f8ba6df..f6ad2152e6e 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, autoreconfHook , libarchive, perl, xorg, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg_3, alsaLib -, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska +, pkg-config, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ protobuf libmicrodns ]; - nativeBuildInputs = [ autoreconfHook perl pkgconfig removeReferencesTo ] + nativeBuildInputs = [ autoreconfHook perl pkg-config removeReferencesTo ] ++ optionals withQt5 [ wrapQtAppsHook ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index c0b6853cf32..06e91218cac 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, mkDerivation -, pkgconfig, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr +, pkg-config, qtbase, qttools, qmake, qtmultimedia, qtx11extras, alsaLib, libv4l, libXrandr , ffmpeg }: @@ -15,7 +15,7 @@ mkDerivation rec { sha256 = "1a85vbsi53mhzva49smqwcs61c51wv3ic410nvb9is9nlsbifwan"; }; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ alsaLib libv4l diff --git a/pkgs/applications/video/webcamoid/default.nix b/pkgs/applications/video/webcamoid/default.nix index a0d25f2ec1e..ef485fc8201 100644 --- a/pkgs/applications/video/webcamoid/default.nix +++ b/pkgs/applications/video/webcamoid/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, pkgconfig, libxcb, mkDerivation, qmake +{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, qmake , qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2 , ffmpeg-full, gst_all_1, libpulseaudio, alsaLib, jack2 , v4l-utils }: @@ -22,7 +22,7 @@ mkDerivation rec { v4l-utils ]; - nativeBuildInputs = [ pkgconfig qmake ]; + nativeBuildInputs = [ pkg-config qmake ]; qmakeFlags = [ "Webcamoid.pro" diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 747af7a3b02..f197abacee0 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig +, pkg-config , intltool , libX11, libXv, libSM , gtk, libglade @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; buildInputs = with lib; - [ pkgconfig intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; + [ pkg-config intltool libX11 libXv libSM gtk libglade wxGTK perlPackages.XMLParser xvidcore mjpegtools alsaLib libv4l cimg ]; NIX_CFLAGS_COMPILE="-I ${cimg}/include/cimg"; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index c11d77c2974..651597b3a48 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, xorg, libpng, xineLib, readline, ncurses, curl +{lib, stdenv, fetchurl, pkg-config, xorg, libpng, xineLib, readline, ncurses, curl , lirc, shared-mime-info, libjpeg }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10zmmss3hm8gjjyra20qhdc0lb1m6sym2nb2w62bmfk8isfw9gsl"; }; - nativeBuildInputs = [ pkgconfig shared-mime-info ]; + nativeBuildInputs = [ pkg-config shared-mime-info ]; buildInputs = [ xineLib libpng readline ncurses curl lirc libjpeg diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 06a433f4021..e0cca040987 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perlPackages, pkgconfig, gtk2 +{ lib, stdenv, fetchurl, perlPackages, pkg-config, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ ./xlib.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 58d7a3ad704..f2418d80d2e 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, pkgconfig, libtool +, pkg-config, libtool , gtk2, libGLU, libGL, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ]; buildInputs = - [ pkgconfig libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index 59c97c4a8de..32d5be13d3b 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkgconfig, openssl }: +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "h2aWWjycTm84TS89/vhqnAvwOqeeSDtvvCt+Is6I0eI="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; cargoPatches = [ ./cargo-lock-vendor-fix.patch ]; diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 38ce277bf3f..3ad540e5307 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, rustPlatform, fetchgit, runCommand, symlinkJoin -, pkgconfig, minijail, dtc, libusb1, libcap, linux +, pkg-config, minijail, dtc, libusb1, libcap, linux }: let @@ -55,7 +55,7 @@ in cargoSha256 = "0lhivwvdihslwp81i3sa5q88p5hr83bzkvklrcgf6x73arwk8kdz"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ dtc libcap libusb1 minijail ]; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index ef506c01cfb..3f4bbedbc1b 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , go-md2man -, pkgconfig +, pkg-config , libcap , libseccomp , python3 @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ autoreconfHook go-md2man pkgconfig python3 ]; + nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ]; diff --git a/pkgs/applications/virtualization/libnvidia-container/default.nix b/pkgs/applications/virtualization/libnvidia-container/default.nix index e7cfb3c7a58..3ce493c6178 100644 --- a/pkgs/applications/virtualization/libnvidia-container/default.nix +++ b/pkgs/applications/virtualization/libnvidia-container/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitHub -, pkgconfig +, pkg-config , libelf , libcap , libseccomp @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; - nativeBuildInputs = [ pkgconfig rpcsvc-proto makeWrapper ]; + nativeBuildInputs = [ pkg-config rpcsvc-proto makeWrapper ]; buildInputs = [ libelf libcap libseccomp libtirpc ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index e7c8cc4d47a..720f684f44c 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_ttf, spice-protocol +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol , fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp , libXi, libXext, wayland, libffi, libGLU, expat, libbfd }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index a5c8d976932..1afe994977c 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, autoreconfHook, fuse, libmspack, openssl, pam, xercesc, icu, libdnet, procps, libtirpc, rpcsvc-proto, libX11, libXext, libXinerama, libXi, libXrender, libXrandr, libXtst, - pkgconfig, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, + pkg-config, glib, gdk-pixbuf-xlib, gtk3, gtkmm3, iproute, dbus, systemd, which, withX ? true }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; buildInputs = [ fuse glib icu libdnet libmspack libtirpc openssl pam procps rpcsvc-proto xercesc ] ++ lib.optionals withX [ gdk-pixbuf-xlib gtk3 gtkmm3 libX11 libXext libXinerama libXi libXrender libXrandr libXtst ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index ce2797d35d0..bf6f2769e7e 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkgconfig, glib +{ lib, stdenv, fetchurl, fetchpatch, python, zlib, pkg-config, glib , perl, pixman, vde2, alsaLib, texinfo, flex , bison, lzo, snappy, libaio, gnutls, nettle, curl , makeWrapper @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { sha256 = "1rd41wwlvp0vpialjp2czs6i3lsc338xc72l3zkbb7ixjfslw5y9"; }; - nativeBuildInputs = [ python python.pkgs.sphinx pkgconfig flex bison ] + nativeBuildInputs = [ python python.pkgs.sphinx pkg-config flex bison ] ++ optionals gtkSupport [ wrapGAppsHook ]; buildInputs = [ zlib glib perl pixman diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix index 547b177b3a6..00dffc385a1 100644 --- a/pkgs/applications/virtualization/qtemu/default.nix +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }: +{ lib, stdenv, mkDerivation, fetchFromGitLab, pkg-config, qmake, qtbase, qemu, makeWrapper }: mkDerivation rec { pname = "qtemu"; @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake - pkgconfig + pkg-config ]; buildInputs = [ diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 998a127b2fc..48b0423983d 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib, +{lib, stdenv, fetchurl, pkg-config, alsaLib, spice-protocol, glib, libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsaLib spice-protocol glib libdrm libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 1d2a32c54e3..1633c8d66f3 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkgconfig +{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config , qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol , libselinux, libsepol, util-linux @@ -35,7 +35,7 @@ mkDerivation rec { libselinux libsepol util-linux ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools ]; meta = with lib; { homepage = "https://f1ash.github.io/qt-virt-manager"; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index c31552db301..4fd56e0cae3 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, intltool, shared-mime-info, wrapGAppsHook , glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; }; - nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ]; + nativeBuildInputs = [ pkg-config intltool shared-mime-info wrapGAppsHook glib ]; buildInputs = [ glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte ] ++ optionals spiceSupport [ diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index eb7d067b6d5..be9598293cc 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,7 +1,7 @@ { config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras -, qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +, qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). @@ -45,7 +45,7 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 ] + nativeBuildInputs = [ pkg-config which docbook_xsl docbook_xml_dtd_43 ] ++ optional (!headless) wrapQtAppsHook; # Wrap manually because we wrap just a small number of executables. |