public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix

Browse Source 
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
This commit is contained in:
Jonathan Ringer
2021-01-19 01:16:25 -08:00
committed by Jonathan Ringer
parent 200bb8c977
commit 9bb3fccb5b
1653 changed files with 3872 additions and 3872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }:
{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }:
rustPlatform.buildRustPackage rec {
pname = "cargo-tarpaulin";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
};
nativeBuildInputs = [
pkgconfig
pkg-config
];
buildInputs = [ openssl ];
pkgs/development/tools/analysis/kcov/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, cmake, pkgconfig, zlib, curl, elfutils, python, libiberty, libopcodes}:
{stdenv, fetchFromGitHub, cmake, pkg-config, zlib, curl, elfutils, python, libiberty, libopcodes}:
stdenv.mkDerivation rec {
pname = "kcov";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
preConfigure = "patchShebangs src/bin-to-c-source.py";
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
pkgs/development/tools/analysis/panopticon/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, rustPlatform, qt5, git, cmake
, pkgconfig, makeWrapper }:
, pkg-config, makeWrapper }:
rustPlatform.buildRustPackage rec {
pname = "panopticon";
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa";
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ makeWrapper ];
propagatedBuildInputs = with qt5; [
qt5.qtbase
pkgs/development/tools/analysis/radare2/cutter.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ fetchFromGitHub, lib, mkDerivation
# nativeBuildInputs
, qmake, pkgconfig
, qmake, pkg-config
# Qt
, qtbase, qtsvg, qtwebengine
# buildInputs
@@ -30,12 +30,12 @@ mkDerivation rec {
--replace "include(lib_radare2.pri)" ""
'';
nativeBuildInputs = [ qmake pkgconfig python3 wrapQtAppsHook ];
nativeBuildInputs = [ qmake pkg-config python3 wrapQtAppsHook ];
propagatedBuildInputs = [ python3.pkgs.pyside2 ];
buildInputs = [ qtbase qtsvg qtwebengine r2-for-cutter python3 ];
qmakeFlags = with python3.pkgs; [
"CONFIG+=link_pkgconfig"
"CONFIG+=link_pkg-config"
"PKGCONFIG+=r_core"
# Leaving this enabled doesn't break build but generates errors
# at runtime (to console) about being unable to load needed bits.
pkgs/development/tools/analysis/radare2/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{stdenv, fetchFromGitHub
, buildPackages
, pkgconfig
, pkg-config
, libusb-compat-0_1, readline, libewf, perl, zlib, openssl
, libuv, file, libzip, xxHash
, gtk2 ? null, vte ? null, gtkdialog ? null
@@ -78,7 +78,7 @@ let
enableParallelBuilding = true;
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ]
++ optional useX11 [ gtkdialog vte gtk2 ]
++ optional rubyBindings [ ruby ]
pkgs/development/tools/analysis/retdec/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
, autoconf
, automake
, libtool
, pkgconfig
, pkg-config
, bison
, flex
, groff
@@ -145,7 +145,7 @@ in stdenv.mkDerivation rec {
autoconf
automake
libtool
pkgconfig
pkg-config
bison
flex
groff
pkgs/development/tools/analysis/smatch/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, sqlite, pkgconfig, perl
{ stdenv, fetchgit, sqlite, pkg-config, perl
, buildllvmsparse ? true
, buildc2xml ? true
, llvm ? null, libxml2 ? null
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [sqlite perl]
++ stdenv.lib.optional buildllvmsparse llvm
++ stdenv.lib.optional buildc2xml libxml2;
pkgs/development/tools/analysis/sparse/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, pkgconfig, libxml2, llvm }:
{ fetchurl, stdenv, pkg-config, libxml2, llvm }:
stdenv.mkDerivation rec {
name = "sparse-0.5.0";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sed -i Makefile -e "s|^PREFIX=.*$|PREFIX=$out|g"
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libxml2 llvm ];
doCheck = true;
pkgs/development/tools/build-managers/cmake/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig
{ stdenv, lib, fetchurl, pkg-config
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
, buildPackages
# darwin attributes
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ setupHook pkgconfig ];
nativeBuildInputs = [ setupHook pkg-config ];
buildInputs = []
++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
pkgs/development/tools/build-managers/conan/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, python3, fetchFromGitHub, git, pkgconfig }:
{ lib, python3, fetchFromGitHub, git, pkg-config }:
# Note:
# Conan has specific dependency demands; check
@@ -72,7 +72,7 @@ in newPython.pkgs.buildPythonApplication rec {
];
checkInputs = [
pkgconfig
pkg-config
git
] ++ (with newPython.pkgs; [
codecov
pkgs/development/tools/build-managers/gnumake/4.2/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
assert guileSupport -> ( pkgconfig != null && guile != null );
assert guileSupport -> ( pkg-config != null && guile != null );
let
version = "4.2.1";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
./glibc-2.27-glob.patch
];
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
buildInputs = stdenv.lib.optionals guileSupport [ guile ];
configureFlags = stdenv.lib.optional guileSupport "--with-guile"
pkgs/development/tools/build-managers/gnumake/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, guileSupport ? false, pkgconfig ? null , guile ? null }:
{ stdenv, fetchurl, guileSupport ? false, pkg-config ? null , guile ? null }:
assert guileSupport -> ( pkgconfig != null && guile != null );
assert guileSupport -> ( pkg-config != null && guile != null );
let
version = "4.3";
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
./impure-dirs.patch
];
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkgconfig ];
nativeBuildInputs = stdenv.lib.optionals guileSupport [ pkg-config ];
buildInputs = stdenv.lib.optionals guileSupport [ guile ];
configureFlags = stdenv.lib.optional guileSupport "--with-guile"
pkgs/development/tools/build-managers/meson/default.nix
+1 -1
View File
@@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec {
# 0.45 update enabled tests but they are failing
doCheck = false;
# checkInputs = [ ninja pkgconfig ];
# checkInputs = [ ninja pkg-config ];
# checkPhase = "python ./run_project_tests.py";
postFixup = ''
pkgs/development/tools/build-managers/tup/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }:
{ stdenv, fetchFromGitHub, fuse3, pkg-config, pcre }:
stdenv.mkDerivation rec {
pname = "tup";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ fuse3 pcre ];
configurePhase = ''
pkgs/development/tools/cargo-web/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, openssl, perl, pkgconfig, rustPlatform
{ stdenv, fetchFromGitHub, openssl, perl, pkg-config, rustPlatform
, CoreServices, Security
}:
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0i9xp7vd1rp6xgkbbrspm3qq4hxwfwa00di3k73z1x64d3d8r5fm";
nativeBuildInputs = [ openssl perl pkgconfig ];
nativeBuildInputs = [ openssl perl pkg-config ];
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];
meta = with stdenv.lib; {
pkgs/development/tools/chit/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl
{ stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl
, darwin
}:
@@ -17,7 +17,7 @@ buildRustPackage rec {
cargoSha256 = "1w25k3bqmmcrhpkw510vbwph0rfmrzi2wby0z2rz1q4k1f9k486m";
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig ];
nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
buildInputs = []
++ stdenv.lib.optionals stdenv.isLinux [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreFoundation CoreServices Security ])
pkgs/development/tools/diesel-cli/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkgconfig, Security
{ stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security
, sqliteSupport ? true, sqlite
, postgresqlSupport ? true, postgresql
, mysqlSupport ? true, mysql, zlib, libiconv
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1vbb7r0dpmq8363i040bkhf279pz51c59kcq9v5qr34hs49ish8g";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ optional stdenv.isDarwin Security
++ optional (stdenv.isDarwin && mysqlSupport) libiconv
pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libxml2Python, libxslt, intltool, gnome3
{ stdenv, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3
, python2Packages }:
python2Packages.buildPythonApplication rec {
@@ -12,7 +12,7 @@ python2Packages.buildPythonApplication rec {
sha256 = "19n4x25ndzngaciiyd8dd6s2mf9gv6nv3wv27ggns2smm7zkj1nb";
};
nativeBuildInputs = [ intltool pkgconfig libxslt.dev ];
nativeBuildInputs = [ intltool pkg-config libxslt.dev ];
buildInputs = [ libxslt ];
configureFlags = [ "--disable-scrollkeeper" ];
pkgs/development/tools/drm_info/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub
, libdrm, json_c, pciutils
, meson, ninja, pkgconfig
, meson, ninja, pkg-config
}:
stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f";
};
nativeBuildInputs = [ meson ninja pkgconfig ];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ libdrm json_c pciutils ];
meta = with stdenv.lib; {
pkgs/development/tools/flatpak-builder/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
, gettext
, libxml2
, libxslt
, pkgconfig
, pkg-config
, xmlto
, acl
@@ -64,7 +64,7 @@ in stdenv.mkDerivation rec {
gettext
libxml2
libxslt
pkgconfig
pkg-config
xmlto
];
pkgs/development/tools/fmbt/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python, autoreconfHook, pkgconfig, makeWrapper
{ stdenv, fetchFromGitHub, python, autoreconfHook, pkg-config, makeWrapper
, flex
, gettext, libedit, glib, imagemagick, libxml2, boost, gnuplot, graphviz
, tesseract, gts, libXtst
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp";
};
nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper
nativeBuildInputs = [ autoreconfHook pkg-config flex makeWrapper
python.pkgs.wrapPython ];
buildInputs = [ python gettext libedit glib imagemagick libxml2 boost
pkgs/development/tools/git-series/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, rustPlatform
, openssl, cmake, perl, pkgconfig, zlib, curl, libgit2, libssh2
, openssl, cmake, perl, pkg-config, zlib, curl, libgit2, libssh2
}:
with rustPlatform;
@@ -36,7 +36,7 @@ buildRustPackage rec {
LIBGIT2_SYS_USE_PKG_CONFIG = true;
LIBSSH2_SYS_USE_PKG_CONFIG = true;
nativeBuildInputs = [ cmake pkgconfig perl ];
nativeBuildInputs = [ cmake pkg-config perl ];
buildInputs = [ openssl zlib curl libgit2 libssh2 ];
postBuild = ''
pkgs/development/tools/glslviewer/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage
{ stdenv, fetchFromGitHub, glfw, pkg-config, libXrandr, libXdamage
, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi
, libX11, libGLU, python3Packages, ensureNewerSourcesForZipFilesHook
, Cocoa
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0v7x93b61ama0gmzlx1zc56jgi7bvzsfvbkfl82xzwf2h5g1zni7";
};
nativeBuildInputs = [ pkgconfig ensureNewerSourcesForZipFilesHook python3Packages.six ];
nativeBuildInputs = [ pkg-config ensureNewerSourcesForZipFilesHook python3Packages.six ];
buildInputs = [
glfw libGLU glfw libXrandr libXdamage
libXext libXrender libXinerama libXcursor libXxf86vm
pkgs/development/tools/gnome-desktop-testing/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv
, glib
, autoreconfHook
, pkgconfig
, pkg-config
, systemd
, fetchFromGitLab
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
pkgconfig
pkg-config
];
buildInputs = [
pkgs/development/tools/godot/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, scons, pkgconfig, libX11, libXcursor
{ stdenv, lib, fetchFromGitHub, scons, pkg-config, libX11, libXcursor
, libXinerama, libXrandr, libXrender, libpulseaudio ? null
, libXi ? null, libXext, libXfixes, freetype, openssl
, alsaLib, libGLU, zlib, yasm ? null }:
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
sha256 = "19vrp5lhyvxbm6wjxzn28sn3i0s8j08ca7nani8l1nrhvlc8wi0v";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
scons libX11 libXcursor libXinerama libXrandr libXrender
libXi libXext libXfixes freetype openssl alsaLib libpulseaudio
pkgs/development/tools/guile/g-wrap/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, guile, guile-lib, libffi, pkgconfig, glib }:
{ fetchurl, stdenv, guile, guile-lib, libffi, pkg-config, glib }:
stdenv.mkDerivation rec {
pname = "g-wrap";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
# Note: Glib support is optional, but it's quite useful (e.g., it's used by
# Guile-GNOME).
pkgs/development/tools/halfempty/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, glib, util-linux, scowl }:
{ lib, stdenv, fetchFromGitHub, pkg-config, glib, util-linux, scowl }:
stdenv.mkDerivation rec {
pname = "halfempty";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0838pw0ccjvlxmjygzrnppz1fx1a10vjzdgjbxgb4wgpqjr8v6vc";
};
nativeBuildInputs = [ pkgconfig util-linux ];
nativeBuildInputs = [ pkg-config util-linux ];
buildInputs = [ glib ];
enableParallelBuilding = true;
pkgs/development/tools/icestorm/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, pkgconfig, libftdi1
, pkg-config, libftdi1
, python3, pypy3
# PyPy yields large improvements in build time and runtime performance, and
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
sha256 = "0vxhqs2fampglg3xlfwb35229iv96kvlwp1gyxrdrmlpznhkqdrk";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ passthru.pythonPkg libftdi1 ];
makeFlags = [ "PREFIX=$(out)" ];
pkgs/development/tools/icr/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which
{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkg-config, which
, openssl, readline, libyaml, zlib }:
crystal.buildCrystalPackage rec {
@@ -16,7 +16,7 @@ crystal.buildCrystalPackage rec {
buildInputs = [ libyaml openssl readline zlib ];
nativeBuildInputs = [ makeWrapper pkgconfig which ];
nativeBuildInputs = [ makeWrapper pkg-config which ];
# tests are failing due to our sandbox
doCheck = false;
pkgs/development/tools/jo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}:
{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkg-config}:
stdenv.mkDerivation rec {
pname = "jo";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ];
nativeBuildInputs = [ autoreconfHook pandoc pkg-config ];
meta = with stdenv.lib; {
description = "A small utility to create JSON objects";
pkgs/development/tools/kafkacat/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, pkgconfig, zlib, rdkafka, yajl }:
{ stdenv, fetchFromGitHub, pkg-config, zlib, rdkafka, yajl }:
stdenv.mkDerivation rec {
pname = "kafkacat";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0z3bw00s269myfd1xqksjyznmgp74xfs09xqlq347adsgby3cmfs";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib rdkafka yajl ];
pkgs/development/tools/libsigrok/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libzip, glib, libusb1, libftdi1, check
{ stdenv, fetchurl, pkg-config, libzip, glib, libusb1, libftdi1, check
, libserialport, librevisa, doxygen, glibmm, python
, version ? "0.5.1", sha256 ? "171b553dir5gn6w4f7n37waqk62nq2kf1jykx4ifjacdz5xdw3z4"
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "14sd8xqph4kb109g073daiavpadb20fcz7ch1ipn0waz7nlly4sw";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libzip glib libusb1 libftdi1 check libserialport
librevisa doxygen glibmm python
];
pkgs/development/tools/libsigrokdecode/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, python3, libsigrok, check }:
{ stdenv, fetchurl, pkg-config, glib, python3, libsigrok, check }:
stdenv.mkDerivation rec {
name = "libsigrokdecode-0.5.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1h1zi1kpsgf6j2z8j8hjpv1q7n49i3fhqjn8i178rka3cym18265";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib python3 libsigrok check ];
meta = with stdenv.lib; {
pkgs/development/tools/mdk/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, pkgconfig, glib }:
{ stdenv, fetchurl, intltool, pkg-config, glib }:
stdenv.mkDerivation {
name = "gnu-mdk-1.3.0";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
url = "https://ftp.gnu.org/gnu/mdk/v1.3.0/mdk-1.3.0.tar.gz";
sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool glib ];
postInstall = ''
mkdir -p $out/share/emacs/site-lisp/
pkgs/development/tools/misc/autogen/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkgconfig, perl, guile, libxml2 }:
{ stdenv, buildPackages, fetchurl, autoreconfHook, which, pkg-config, perl, guile, libxml2 }:
stdenv.mkDerivation rec {
pname = "autogen";
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "lib" "out" "man" "info" ];
nativeBuildInputs = [
which pkgconfig perl autoreconfHook/*patches applied*/
which pkg-config perl autoreconfHook/*patches applied*/
] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
# autogen needs a build autogen when cross-compiling
buildPackages.buildPackages.autogen buildPackages.texinfo
pkgs/development/tools/misc/awf/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkgconfig
{ stdenv, fetchFromGitHub, autoreconfHook, gtk2, gtk3, pkg-config
, wrapGAppsHook }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
};
nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ];
buildInputs = [ gtk2 gtk3 ];
pkgs/development/tools/misc/babeltrace/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt, elfutils }:
{ stdenv, fetchurl, pkg-config, glib, libuuid, popt, elfutils }:
stdenv.mkDerivation rec {
name = "babeltrace-1.5.8";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1hkg3phnamxfrhwzmiiirbhdgckzfkqwhajl0lmr1wfps7j47wcz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libuuid popt elfutils ];
meta = with stdenv.lib; {
pkgs/development/tools/misc/blackmagic/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig
, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkg-config
, python, pythonPackages
}:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
gcc-arm-embedded pkgconfig
gcc-arm-embedded pkg-config
];
buildInputs = [
pkgs/development/tools/misc/bsdbuild/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }:
{ stdenv, fetchurl, perl, libtool, pkg-config, gettext, mandoc, ed }:
stdenv.mkDerivation rec {
pname = "bsdbuild";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ perl mandoc ed ];
nativeBuildInputs = [ pkgconfig libtool gettext ];
nativeBuildInputs = [ pkg-config libtool gettext ];
prePatch = ''
#ignore unfamiliar flags
pkgs/development/tools/misc/coccinelle/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkgconfig }:
{ fetchurl, stdenv, python, ncurses, ocamlPackages, pkg-config }:
stdenv.mkDerivation rec {
pname = "coccinelle";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = with ocamlPackages; [
ocaml findlib menhir
ocaml_pcre pycaml
python ncurses pkgconfig
python ncurses pkg-config
];
doCheck = !stdenv.isDarwin;
pkgs/development/tools/misc/d-feet/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv
, pkgconfig
, pkg-config
, fetchurl
, meson
, ninja
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
itstool
meson
ninja
pkgconfig
pkg-config
python3
wrapGAppsHook
];
pkgs/development/tools/misc/dfu-util/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ stdenv, fetchurl, pkgconfig, libusb1 }:
{ stdenv, fetchurl, pkg-config, libusb1 }:
stdenv.mkDerivation rec {
pname = "dfu-util";
version = "0.10";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 ];
src = fetchurl {
pkgs/development/tools/misc/distcc/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand
{ stdenv, fetchFromGitHub, popt, avahi, pkg-config, python, gtk2, runCommand
, gcc, autoconf, automake, which, procps, libiberty_static
, runtimeShell
, sysconfDir ? "" # set this parameter to override the default value $out/etc
@@ -17,8 +17,8 @@ let
sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake which procps libiberty_static];
nativeBuildInputs = [ pkg-config ];
buildInputs = [popt avahi pkg-config python gtk2 autoconf automake which procps libiberty_static];
preConfigure =
''
export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)
pkgs/development/tools/misc/eggdbus/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus-glib }:
{ stdenv, fetchurl, pkg-config, glib, dbus, dbus-glib }:
stdenv.mkDerivation rec {
name = "eggdbus-0.6";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib dbus dbus-glib ];
meta = with stdenv.lib; {
pkgs/development/tools/misc/fujprog/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv
, fetchFromGitHub
, cmake
, pkgconfig
, pkg-config
, IOKit
, libftdi1
, libusb-compat-0_1
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
cmake
pkgconfig
pkg-config
];
buildInputs = [
pkgs/development/tools/misc/gdb/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv, targetPackages
# Build time
, fetchurl, pkgconfig, perl, texinfo, setupDebugInfoDirs, buildPackages
, fetchurl, pkg-config, perl, texinfo, setupDebugInfoDirs, buildPackages
# Run time
, ncurses, readline, gmp, mpfr, expat, libipt, zlib, dejagnu
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
./darwin-target-match.patch
];
nativeBuildInputs = [ pkgconfig texinfo perl setupDebugInfoDirs ];
nativeBuildInputs = [ pkg-config texinfo perl setupDebugInfoDirs ];
buildInputs = [ ncurses readline gmp mpfr expat libipt zlib guile ]
++ stdenv.lib.optional pythonSupport python3
pkgs/development/tools/misc/gob2/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, bison, flex, gnome3 }:
{ stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }:
stdenv.mkDerivation rec {
pname = "gob2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
# configure script looks for d-bus but it is only needed for tests
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib bison flex ];
passthru = {
pkgs/development/tools/misc/gpshell/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin
{ stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
, makeWrapper
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ globalplatform pcsclite makeWrapper ];
postFixup = ''
pkgs/development/tools/misc/gtkdialog/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, gtk2, pkgconfig }:
{stdenv, fetchurl, gtk2, pkg-config }:
stdenv.mkDerivation {
name = "gtkdialog-0.8.3";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 ];
meta = {
pkgs/development/tools/misc/gtkperf/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk2, pkgconfig, libintl }:
{ stdenv, fetchurl, gtk2, pkg-config, libintl }:
stdenv.mkDerivation {
name = "gtkperf-0.40.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
hardeningDisable = [ "format" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 libintl ];
# https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db
pkgs/development/tools/misc/hydra-cli/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, pkgconfig, openssl, fetchFromGitHub, rustPlatform, darwin }:
{ stdenv, lib, pkg-config, openssl, fetchFromGitHub, rustPlatform, darwin }:
rustPlatform.buildRustPackage rec {
pname = "hydra-cli";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
nativeBuildInputs = [
pkgconfig
pkg-config
];
meta = with stdenv.lib; {
pkgs/development/tools/misc/hydra/common.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub
, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx
, makeWrapper, autoconf, automake, libtool, unzip, pkg-config, sqlite, libpqxx
, top-git, mercurial, darcs, subversion, breezy, openssl, bzip2, libxslt
, guile, perl, postgresql, nukeReferences, git, boehmgc, nlohmann_json
, docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar
@@ -92,7 +92,7 @@ in stdenv.mkDerivation rec {
gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy
] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ];
pkgs/development/tools/misc/intel-gpu-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, libdrm, libpciaccess, cairo, xorgproto, udev
{ stdenv, fetchurl, pkg-config, libdrm, libpciaccess, cairo, xorgproto, udev
, libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3, kmod
, procps, utilmacros, gtk-doc, openssl, peg, elfutils
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "04fx7xclhick3k7fyk9c4mn8mxzf1253j1r0hrvj9sl40j7lsia0";
};
nativeBuildInputs = [ pkgconfig utilmacros ];
nativeBuildInputs = [ pkg-config utilmacros ];
buildInputs = [ libdrm libpciaccess cairo xorgproto udev libX11 kmod
libXext libXv libXrandr glib bison libunwind python3 procps
gtk-doc openssl peg elfutils ];
pkgs/development/tools/misc/kconfig-frontends/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, bison, flex, gperf, ncurses, pythonPackages }:
{ stdenv, fetchurl, pkg-config, bison, flex, gperf, ncurses, pythonPackages }:
stdenv.mkDerivation rec {
basename = "kconfig-frontends";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
url = "http://ymorin.is-a-geek.org/download/${basename}/${name}.tar.xz";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ bison flex gperf ncurses pythonPackages.python pythonPackages.wrapPython ];
configureFlags = [
pkgs/development/tools/misc/lttng-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
{ stdenv, fetchurl, pkg-config, popt, libuuid, liburcu, lttng-ust, kmod, libxml2 }:
stdenv.mkDerivation rec {
pname = "lttng-tools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1g0g7ypxvc7wd5x4d4ixmfgl9yk0lxax3ymm95hcjwxn5p497r6w";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ popt libuuid liburcu lttng-ust libxml2 kmod ];
meta = with stdenv.lib; {
pkgs/development/tools/misc/lttv/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
{ stdenv, fetchurl, pkg-config, glib, gtk2, popt, babeltrace }:
stdenv.mkDerivation rec {
name = "lttv-1.5";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "1faldxnh9dld5k0vxckwpqw241ya1r2zv286l6rpgqr500zqw7r1";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib gtk2 popt babeltrace ];
meta = with stdenv.lib; {
pkgs/development/tools/misc/msitools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2, gnome3 }:
{ stdenv, fetchurl, intltool, glib, pkg-config, libgsf, libuuid, gcab, bzip2, gnome3 }:
stdenv.mkDerivation rec {
pname = "msitools";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "19wb3n3nwkpc6bjr0q3f1znaxsfaqgjbdxxnbx8ic8bb5b49hwac";
};
nativeBuildInputs = [ intltool pkgconfig ];
nativeBuildInputs = [ intltool pkg-config ];
buildInputs = [ glib libgsf libuuid gcab bzip2 ];
passthru = {
pkgs/development/tools/misc/pkg-config/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
version = "0.29.2";
src = fetchurl {
url = "https://pkgconfig.freedesktop.org/releases/${pname}-${version}.tar.gz";
url = "https://pkg-config.freedesktop.org/releases/${pname}-${version}.tar.gz";
sha256 = "14fmwzki1rlz8bs2p810lk6jqdxsk966d8drgsjmi54cd00rrikg";
};
pkgs/development/tools/misc/sccache/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkgconfig, glib, openssl, darwin }:
{ stdenv, fetchFromGitHub, cargo, rustc, rustPlatform, pkg-config, glib, openssl, darwin }:
rustPlatform.buildRustPackage rec {
version = "0.2.14";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoBuildFlags = [ "--features=all" ];
nativeBuildInputs = [
pkgconfig cargo rustc
pkg-config cargo rustc
];
buildInputs = [
openssl
pkgs/development/tools/misc/sysbench/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, libmysqlclient, libaio
}:
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
pname = "sysbench";
version = "1.0.20";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ libmysqlclient libaio ];
src = fetchFromGitHub {
pkgs/development/tools/misc/universal-ctags/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, perl, pythonPackages, libiconv, jansson }:
{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, perl, pythonPackages, libiconv, jansson }:
stdenv.mkDerivation {
pname = "universal-ctags";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "14n3ix77rkhq6vq6kspmgjrmm0kg0f8cxikyqdq281sbnfq8bajn";
};
nativeBuildInputs = [ autoreconfHook pkgconfig pythonPackages.docutils ];
nativeBuildInputs = [ autoreconfHook pkg-config pythonPackages.docutils ];
buildInputs = [ jansson ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
# to generate makefile.in
pkgs/development/tools/misc/usb-modeswitch/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, makeWrapper
{ stdenv, lib, fetchurl, pkg-config, makeWrapper
, libusb1, tcl, util-linux, coreutils, bash }:
stdenv.mkDerivation rec {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ libusb1 tcl ];
nativeBuildInputs = [ pkgconfig makeWrapper ];
nativeBuildInputs = [ pkg-config makeWrapper ];
meta = with stdenv.lib; {
description = "A mode switching tool for controlling 'multi-mode' USB devices";
pkgs/development/tools/nemiver/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchurl
, fetchpatch
, pkgconfig
, pkg-config
, gnome3
, gtk3
, libxml2
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
libxml2
intltool
itstool
pkgconfig
pkg-config
wrapGAppsHook
];
pkgs/development/tools/ofono-phonesim/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, mkDerivation
, fetchgit
, autoreconfHook
, pkgconfig
, pkg-config
, qtbase
}:
@@ -18,7 +18,7 @@ mkDerivation {
nativeBuildInputs = [
autoreconfHook
pkgconfig
pkg-config
];
buildInputs = [
pkgs/development/tools/osslsigncode/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, fetchFromGitHub
, autoreconfHook
, libgsf
, pkgconfig
, pkg-config
, openssl
, curl
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "0iwxdzqan2bswz62pmwjcyh01vs6ifpdcannw3s192gqzac1lgg3";
};
nativeBuildInputs = [ autoreconfHook libgsf pkgconfig openssl curl ];
nativeBuildInputs = [ autoreconfHook libgsf pkg-config openssl curl ];
meta = with lib; {
homepage = "https://github.com/mtrojnar/osslsigncode";
pkgs/development/tools/parsing/antlr/4.8.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, jre
, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
, fetchFromGitHub, cmake, ninja, pkg-config, libuuid, darwin }:
let
version = "4.8";
@@ -18,7 +18,7 @@ let
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ cmake ninja pkgconfig ];
nativeBuildInputs = [ cmake ninja pkg-config ];
buildInputs = stdenv.lib.optional stdenv.isLinux libuuid
++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation;
pkgs/development/tools/parsing/hammer/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, glib, pkgconfig, python, scons }:
{ lib, stdenv, fetchgit, glib, pkg-config, python, scons }:
stdenv.mkDerivation {
pname = "hammer";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
rev = "47f34b81e4de834fd3537dd71928c4f3cdb7f533";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib python scons ];
meta = with lib; {
pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix
+13 -13
View File
@@ -56,7 +56,7 @@ self: super:
av = super.av.overridePythonAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig
pkgs.pkg-config
];
buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ];
}
@@ -234,8 +234,8 @@ self: super:
h5py = super.h5py.overridePythonAttrs (
old:
if old.format != "wheel" then rec {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ];
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkg-config self.cython ];
configure_flags = "--hdf5=${pkgs.hdf5}";
postConfigure = ''
${self.python.executable} setup.py configure ${configure_flags}
@@ -386,7 +386,7 @@ self: super:
);
libvirt-python = super.libvirt-python.overridePythonAttrs ({ nativeBuildInputs ? [ ], ... }: {
nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkgconfig ];
nativeBuildInputs = nativeBuildInputs ++ [ pkgs.pkg-config ];
propagatedBuildInputs = [ pkgs.libvirt ];
});
@@ -421,7 +421,7 @@ self: super:
lxml = super.lxml.overridePythonAttrs (
old: {
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ];
nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkg-config libxml2.dev libxslt.dev ];
buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ];
}
);
@@ -452,7 +452,7 @@ self: super:
++ lib.optional stdenv.isDarwin [ Cocoa ];
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig
pkgs.pkg-config
];
postPatch = ''
@@ -637,7 +637,7 @@ self: super:
pillow = super.pillow.overridePythonAttrs (
old: {
nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs;
nativeBuildInputs = [ pkgs.pkg-config ] ++ old.nativeBuildInputs;
buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs;
}
);
@@ -706,7 +706,7 @@ self: super:
nativeBuildInputs = old.nativeBuildInputs ++ [
self.cython
pkgs.pkgconfig
pkgs.pkg-config
pkgs.cmake
];
@@ -755,7 +755,7 @@ self: super:
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.meson
pkgs.ninja
pkgs.pkgconfig
pkgs.pkg-config
];
propagatedBuildInputs = old.propagatedBuildInputs ++ [
@@ -822,7 +822,7 @@ self: super:
pygobject = super.pygobject.overridePythonAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ];
}
);
@@ -873,7 +873,7 @@ self: super:
format = "other";
nativeBuildInputs = old.nativeBuildInputs ++ [
pkgs.pkgconfig
pkgs.pkg-config
pkgs.qt5.qmake
pkgs.xorg.lndir
pkgs.qt5.qtbase
@@ -1012,7 +1012,7 @@ self: super:
pyzmq = super.pyzmq.overridePythonAttrs (
old: {
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ];
}
);
@@ -1117,7 +1117,7 @@ self: super:
tables = super.tables.overridePythonAttrs (
old: {
HDF5_DIR = "${pkgs.hdf5}";
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ];
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ];
propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ];
}
);
pkgs/development/tools/profiling/oprofile/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, buildPackages
, fetchurl, pkgconfig
, fetchurl, pkg-config
, libbfd, popt, zlib, linuxHeaders, libiberty_static
, withGUI ? false, qt4 ? null
}:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
--replace "/bin/cp" "${buildPackages.coreutils}/bin/cp"
'';
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libbfd zlib popt linuxHeaders libiberty_static ]
++ stdenv.lib.optionals withGUI [ qt4 ];
pkgs/development/tools/profiling/sysprof/default.nix
+2 -2
View File
@@ -10,7 +10,7 @@
, libxml2
, meson, ninja
, pango
, pkgconfig
, pkg-config
, polkit
, shared-mime-info
, systemd
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
libxml2
meson
ninja
pkgconfig
pkg-config
shared-mime-info
wrapGAppsHook
gnome3.adwaita-icon-theme
pkgs/development/tools/profiling/systemtap/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper
{ fetchgit, pkg-config, gettext, runCommand, makeWrapper
, elfutils, kernel, gnumake, python2, python2Packages
}:
@@ -17,7 +17,7 @@ let
pname = "systemtap";
inherit version;
src = fetchgit { inherit url rev sha256; };
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ elfutils gettext python2 python2Packages.setuptools ];
enableParallelBuilding = true;
};
pkgs/development/tools/pxview/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }:
{ lib, stdenv, fetchurl, pkg-config, perl, perlPackages, pxlib }:
stdenv.mkDerivation rec {
pname = "pxview";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]);
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
configureFlags = [ "--with-pxlib=${pxlib.out}" ];
pkgs/development/tools/py-spy/default.nix
+1 -1
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkgconfig, libunwind, python3 }:
{ lib, stdenv, pkgsBuildBuild, rustPlatform, fetchFromGitHub, pkg-config, libunwind, python3 }:
rustPlatform.buildRustPackage rec {
pname = "py-spy";
pkgs/development/tools/rtags/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkgconfig }:
{ stdenv, lib, fetchgit, cmake, llvmPackages, openssl, apple_sdk, emacs, pkg-config }:
stdenv.mkDerivation rec {
pname = "rtags";
version = "2.38";
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ llvmPackages.llvm openssl emacs ]
++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ]
++ lib.optionals stdenv.isDarwin [ apple_sdk.libs.xpc apple_sdk.frameworks.CoreServices ];
pkgs/development/tools/rust/cargo-deny/default.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, lib
, rustPlatform
, fetchFromGitHub
, perl, pkgconfig, openssl, Security, libiconv, curl
, perl, pkg-config, openssl, Security, libiconv, curl
}:
rustPlatform.buildRustPackage rec {
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
doCheck = false;
nativeBuildInputs = [ perl pkgconfig ];
nativeBuildInputs = [ perl pkg-config ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
pkgs/development/tools/rust/cargo-geiger/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub
, rustPlatform, pkgconfig, openssl
, rustPlatform, pkg-config, openssl
# testing packages
, cargo-insta
# darwin dependencies
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
'';
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
# FIXME: Use impure version of CoreFoundation because of missing symbols.
# CFURLSetResourcePropertyForKey is defined in the headers but there's no
pkgs/development/tools/rust/cargo-generate/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkgconfig, libiconv, curl }:
{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }:
rustPlatform.buildRustPackage rec {
pname = "cargo-generate";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1vngn9gbiv59wrq230qk2mv00bsbdfk2mi1iqpr736c5wj1caqld";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ];
pkgs/development/tools/rust/cargo-raze/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform
, pkgconfig, curl, libgit2, openssl, Security }:
, pkg-config, curl, libgit2, openssl, Security }:
rustPlatform.buildRustPackage rec {
pname = "cargo-raze";
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1z20xc508a3slc1ii3hy09swvlyib14zwf9akxc0h24d5m48as1c";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ curl libgit2 openssl ]
++ stdenv.lib.optional stdenv.isDarwin Security;
pkgs/development/tools/rust/cargo-udeps/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }:
{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, CoreServices, Security, libiconv }:
rustPlatform.buildRustPackage rec {
pname = "cargo-udeps";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "17931z5nbigfzvvhr6k64s2j9p1sp9nvmy5fyf92j3ci02dplm5c";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ];
pkgs/development/tools/rust/maturin/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkgconfig
{ lib, stdenv, fetchFromGitHub, rustPlatform, dbus, gmp, openssl, pkg-config
, darwin }:
let
@@ -16,7 +16,7 @@ in rustPlatform.buildRustPackage rec {
cargoSha256 = "1n0sxkhcdg2rbzqd7826pa7sxlnn0c2sc8l6lc98xw21vvqisc8n";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gmp openssl ]
++ stdenv.lib.optional stdenv.isDarwin Security
pkgs/development/tools/rust/rustup/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, lib, runCommand, patchelf
, fetchFromGitHub, rustPlatform, makeWrapper
, pkgconfig, curl, zlib, Security, CoreServices }:
, pkg-config, curl, zlib, Security, CoreServices }:
let
libPath = lib.makeLibraryPath [
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1zkrrg5m0j9rk65g51v2zh404529p9z84qqb7bfyjmgiqlnh48ig";
nativeBuildInputs = [ makeWrapper pkgconfig ];
nativeBuildInputs = [ makeWrapper pkg-config ];
buildInputs = [
curl zlib
pkgs/development/tools/scaff/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, rustPlatform, fetchFromGitLab, pkgconfig, openssl }:
{ lib, rustPlatform, fetchFromGitLab, pkg-config, openssl }:
rustPlatform.buildRustPackage rec {
pname = "scaff";
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "1v6580mj70d7cqbjw32slz65lg6c8ficq5mdkfbivs63hqkv4hgx";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
meta = with lib; {
pkgs/development/tools/sigrok-cli/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, glib, libsigrok, libsigrokdecode }:
{ lib, stdenv, fetchurl, pkg-config, glib, libsigrok, libsigrokdecode }:
stdenv.mkDerivation rec {
name = "sigrok-cli-0.7.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "15vpn1psriadcbl6v9swwgws7dva85ld03yv6g1mgm27kx11697m";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glib libsigrok libsigrokdecode ];
meta = with lib; {
pkgs/development/tools/simavr/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libelf, which, pkgconfig, freeglut
{ lib, stdenv, fetchFromGitHub, libelf, which, pkg-config, freeglut
, avrgcc, avrlibc
, libGLU, libGL
, GLUT }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ];
nativeBuildInputs = [ which pkgconfig avrgcc ];
nativeBuildInputs = [ which pkg-config avrgcc ];
buildInputs = [ libelf freeglut libGLU libGL ]
++ stdenv.lib.optional stdenv.isDarwin GLUT;
pkgs/development/tools/sunxi-tools/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }:
{ lib, stdenv, fetchFromGitHub, pkg-config, libusb1, zlib }:
stdenv.mkDerivation {
name = "sunxi-tools-20181113";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "1yhl6jfl2cws596ymkyhm8h9qkcvp67v8hlh081lsaqv1i8j9yig";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libusb1 zlib ];
makeFlags = [ "PREFIX=$(out)" ];
pkgs/development/tools/tracy/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }:
{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkg-config, freetype, Carbon, AppKit, capstone }:
stdenv.mkDerivation rec {
pname = "tracy";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0s39kimpc03x48kh7lyhblfs8y4mdzcz3g7f806h90x7zndsmfxj";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ glfw capstone ]
++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ]
pkgs/development/tools/vala-lint/default.nix
+2 -2
View File
@@ -4,7 +4,7 @@
, meson
, ninja
, pantheon
, pkgconfig
, pkg-config
, vala
, gettext
, wrapGAppsHook
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
gettext
meson
ninja
pkgconfig
pkg-config
vala
wrapGAppsHook
];
pkgs/development/tools/vogl/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchFromGitHub
, cmake, git, pkgconfig, wget, zip
, cmake, git, pkg-config, wget, zip
, qtbase, qtx11extras
, libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
, SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
@@ -26,7 +26,7 @@ mkDerivation {
})
];
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [
git wget zip
pkgs/development/tools/vulkan-validation-layers/default.nix
+2 -2
View File
@@ -8,7 +8,7 @@
, vulkan-headers
, vulkan-loader
, glslang
, pkgconfig
, pkg-config
, xlibsWrapper
, libxcb
, libXrandr
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [
pkgconfig
pkg-config
cmake
python3
];
pkgs/development/tools/wasm-bindgen-cli/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ rustPlatform, fetchFromGitHub, lib, openssl, pkgconfig, stdenv, curl, Security
{ rustPlatform, fetchFromGitHub, lib, openssl, pkg-config, stdenv, curl, Security
, runCommand
}:
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
'';
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
cargoSha256 = "1wrfly7c3an1mjqm7v13mlvx57hwlcxfjijkimicck04q6qdhbp6";
cargoBuildFlags = [ "-p" pname ];
pkgs/development/tools/wasm-pack/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv
, fetchFromGitHub
, rustPlatform
, pkgconfig
, pkg-config
, libressl
, curl
, Security
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
# LibreSSL works around segfault issues caused by OpenSSL being unable to
pkgs/development/tools/watchman/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre
, libtool, pkgconfig, openssl
, libtool, pkg-config, openssl
, confFile ? config.watchman.confFile or null
, withApple ? stdenv.isDarwin, CoreServices
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
};
nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
nativeBuildInputs = [ autoconf automake pkg-config libtool ];
buildInputs = [ pcre openssl ]
++ lib.optionals withApple [ CoreServices ];