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/compilers/adoptopenjdk-icedtea-web/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkgconfig, npapi_sdk, bash, bc }:
{ stdenv, fetchFromGitHub, cargo, rustc, autoreconfHook, jdk, glib, xulrunner, zip, pkg-config, npapi_sdk, bash, bc }:
stdenv.mkDerivation rec {
pname = "adoptopenjdk-icedtea-web";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n";
};
nativeBuildInputs = [ autoreconfHook pkgconfig bc ];
nativeBuildInputs = [ autoreconfHook pkg-config bc ];
buildInputs = [ cargo rustc glib xulrunner zip npapi_sdk ];
preConfigure = ''
pkgs/development/compilers/bluespec/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
, perl
, flex
, bison
, pkgconfig
, pkg-config
, itktcl
, incrtcl
, tcl
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
perl
flex
bison
pkgconfig
pkg-config
ghcWithPackages
];
pkgs/development/compilers/crystal/build-package.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }:
{ stdenv, lib, crystal, shards, git, pkg-config, which, linkFarm, fetchFromGitHub, installShellFiles }:
{
# Some projects do not include a lock file, so you can pass one
@@ -61,7 +61,7 @@ stdenv.mkDerivation (mkDerivationArgs // {
buildInputs = args.buildInputs or [ ] ++ [ crystal ]
++ lib.optional (format != "crystal") shards;
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ];
nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkg-config which ];
buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([
"runHook preBuild"
pkgs/development/compilers/crystal/default.nix
+3 -3
View File
@@ -18,7 +18,7 @@
, makeWrapper
, openssl
, pcre
, pkgconfig
, pkg-config
, readline
, tzdata
, which
@@ -134,7 +134,7 @@ let
buildInputs = commonBuildInputs extraBuildInputs;
nativeBuildInputs = [ binary makeWrapper which pkgconfig llvmPackages.llvm ];
nativeBuildInputs = [ binary makeWrapper which pkg-config llvmPackages.llvm ];
makeFlags = [
"CRYSTAL_CONFIG_VERSION=${version}"
@@ -158,7 +158,7 @@ let
install -Dm755 .build/crystal $bin/bin/crystal
wrapProgram $bin/bin/crystal \
--suffix PATH : ${lib.makeBinPath [ pkgconfig llvmPackages.clang which ]} \
--suffix PATH : ${lib.makeBinPath [ pkg-config llvmPackages.clang which ]} \
--suffix CRYSTAL_PATH : lib:$lib/crystal \
--suffix CRYSTAL_LIBRARY_PATH : ${
lib.makeLibraryPath (commonBuildInputs extraBuildInputs)
pkgs/development/compilers/dtc/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchgit, flex, bison, pkgconfig, which
{ stdenv, lib, fetchgit, flex, bison, pkg-config, which
, pythonSupport ? false, python, swig
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0li992wwd7kgy71bikanqky49y4hq3p3vx35p2hvyxy1k0wfy7i8";
};
nativeBuildInputs = [ flex bison pkgconfig which ] ++ lib.optionals pythonSupport [ python swig ];
nativeBuildInputs = [ flex bison pkg-config which ] ++ lib.optionals pythonSupport [ python swig ];
postPatch = ''
patchShebangs pylibfdt/
pkgs/development/compilers/factor-lang/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, glib, git,
rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
rlwrap, curl, pkg-config, perl, makeWrapper, tzdata, ncurses,
pango, cairo, gtk2, gdk-pixbuf, gtkglext,
mesa, xorg, openssl, unzip }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
./fuel-dir.patch
];
buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
buildInputs = with xorg; [ git rlwrap curl pkg-config perl makeWrapper
libX11 pango cairo gtk2 gdk-pixbuf gtkglext
mesa libXmu libXt libICE libSM openssl unzip ];
pkgs/development/compilers/flux/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig }:
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config }:
stdenv.mkDerivation rec {
pname = "flux";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "11f3ypg0sdq5kj69zgz6kih1yrzgm48r16spyvzwvlswng147410";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
meta = with lib; {
description = "An interface description language used by DirectFB";
pkgs/development/compilers/fsharp/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
# Temporarily avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
{ stdenv, fetchurl, mono, pkgconfig, dotnetbuildhelpers, autoconf, automake, which }:
{ stdenv, fetchurl, mono, pkg-config, dotnetbuildhelpers, autoconf, automake, which }:
stdenv.mkDerivation rec {
pname = "fsharp";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0mvmvwwpl4zq0yvgzdizww8l9azvlrc82xm32nz1fi1nw8x5qfqk";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ mono dotnetbuildhelpers autoconf automake which ];
configurePhase = ''
pkgs/development/compilers/fsharp41/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
# Temporaririly avoid dependency on dotnetbuildhelpers to avoid rebuilding many times while working on it
{ stdenv, fetchurl, pkgconfig, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
{ stdenv, fetchurl, pkg-config, autoconf, automake, which, mono, msbuild, dotnetbuildhelpers, dotnetPackages }:
stdenv.mkDerivation rec {
pname = "fsharp";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0cv6p5pin962vhbpsji40nkckkag5c96kq5qihvg60pc1z821p0i";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
autoconf
automake
pkgs/development/compilers/gcc/4.8/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null
, zip ? null, unzip ? null, pkg-config ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xorgproto ? null
@@ -161,7 +161,7 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig);
++ (optional javaAwtGtk pkg-config);
# For building runtime libs
depsBuildTarget =
pkgs/development/compilers/gcc/4.9/default.nix
+2 -2
View File
@@ -20,7 +20,7 @@
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null
, zip ? null, unzip ? null, pkg-config ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xorgproto ? null
@@ -174,7 +174,7 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig);
++ (optional javaAwtGtk pkg-config);
# For building runtime libs
depsBuildTarget =
pkgs/development/compilers/gcc/6/default.nix
+2 -2
View File
@@ -23,7 +23,7 @@
, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, gnatboot ? null
, zip ? null, unzip ? null, pkgconfig ? null
, zip ? null, unzip ? null, pkg-config ? null
, gtk2 ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xorgproto ? null
@@ -190,7 +190,7 @@ stdenv.mkDerivation ({
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig)
++ (optional javaAwtGtk pkg-config)
++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex);
# For building runtime libs
pkgs/development/compilers/ghcjs-ng/default.nix
+2 -2
View File
@@ -12,7 +12,7 @@
, makeWrapper
, xorg
, gmp
, pkgconfig
, pkg-config
, gcc
, lib
, ghcjsDepOverrides ? (_:_:{})
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
makeWrapper
xorg.lndir
gmp
pkgconfig
pkg-config
] ++ lib.optionals stdenv.isDarwin [
gcc # https://github.com/ghcjs/ghcjs/issues/663
];
pkgs/development/compilers/gnu-smalltalk/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ config, stdenv, fetchurl, pkgconfig, libtool
{ config, stdenv, fetchurl, pkg-config, libtool
, zip, libffi, libsigsegv, readline, gmp
, gnutls, gnome2, cairo, SDL, sqlite
, emacsSupport ? config.emacsSupport or false, emacs ? null }:
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
# The dependencies and their justification are explained at
# http://smalltalk.gnu.org/download
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [
libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk
cairo SDL sqlite
pkgs/development/compilers/go/1.14.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages
, pkgsBuildTarget
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch procps ];
nativeBuildInputs = [ perl which pkg-config patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
pkgs/development/compilers/go/1.15.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, tzdata, iana-etc, runCommand
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages
, pkgsBuildTarget
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch procps ];
nativeBuildInputs = [ perl which pkg-config patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
pkgs/development/compilers/go/1.4.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch, tzdata, iana-etc, libcCross
, pkgconfig
, pkg-config
, pcre
, Security }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "1zdyf883awaqdzm4r3fs76nbpiqx3iswl2p4qxclw2sl5vvynas5";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ pcre ];
depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security;
pkgs/development/compilers/go/2-dev.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ pkgs, stdenv, fetchurl, fetchgit, tzdata, iana-etc, runCommand
, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation
, perl, which, pkg-config, patch, procps, pcre, cacert, Security, Foundation
, mailcap, runtimeShell
, buildPackages
, pkgsBuildTarget
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
};
# perl is used for testing go vet
nativeBuildInputs = [ perl which pkgconfig patch procps ];
nativeBuildInputs = [ perl which pkg-config patch procps ];
buildInputs = [ cacert pcre ]
++ optionals stdenv.isLinux [ stdenv.cc.libc.out ]
++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
pkgs/development/compilers/intel-graphics-compiler/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ stdenv
, fetchFromGitHub
, cmake
, pkgconfig
, pkg-config
, bison
, flex
pkgs/development/compilers/intercal/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl
, pkgconfig
, pkg-config
, bison, flex
, makeWrapper }:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ pkgconfig bison flex makeWrapper ];
[ pkg-config bison flex makeWrapper ];
# Intercal invokes gcc, so we need an explicit PATH
postInstall = ''
pkgs/development/compilers/neko/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkgconfig
{ stdenv, fetchurl, boehmgc, zlib, sqlite, pcre, cmake, pkg-config
, git, apacheHttpd, apr, aprutil, libmysqlclient, mbedtls, openssl, pkgs, gtk2, libpthreadstubs
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1qv47zaa0vzhjlq5wb71627n7dbsxpc1gqpg0hsngjxnbnh1q46g";
};
nativeBuildInputs = [ cmake pkgconfig git ];
nativeBuildInputs = [ cmake pkg-config git ];
buildInputs =
[ boehmgc zlib sqlite pcre apacheHttpd apr aprutil
libmysqlclient mbedtls openssl libpthreadstubs ]
pkgs/development/compilers/openjdk/11.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, bash, pkgconfig, autoconf, cpio, file, which, unzip
{ stdenv, lib, fetchFromGitHub, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap
@@ -25,7 +25,7 @@ let
sha256 = "11j2rqz9nag5y562g99py4p72f2kv4wwwyrnaspmrzax00wynyx7";
};
nativeBuildInputs = [ pkgconfig autoconf ];
nativeBuildInputs = [ pkg-config autoconf ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
pkgs/development/compilers/openjdk/12.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk11
@@ -22,7 +22,7 @@ let
sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
};
nativeBuildInputs = [ pkgconfig autoconf ];
nativeBuildInputs = [ pkg-config autoconf ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
pkgs/development/compilers/openjdk/13.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, bash, pkgconfig, autoconf, cpio, file, which, unzip
{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
, zip, perl, cups, freetype, alsaLib, libjpeg, giflib, libpng, zlib, lcms2
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap
@@ -22,7 +22,7 @@ let
sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
};
nativeBuildInputs = [ pkgconfig autoconf ];
nativeBuildInputs = [ pkg-config autoconf ];
buildInputs = [
cpio file which unzip zip perl zlib cups freetype alsaLib libjpeg giflib
libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
pkgs/development/compilers/openjdk/8.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, lndir, bash, cpio, file, which, unzip, zip
{ stdenv, lib, fetchurl, pkg-config, lndir, bash, cpio, file, which, unzip, zip
, cups, freetype, alsaLib, cacert, perl, liberation_ttf, fontconfig, zlib
, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor, libXrandr
, libjpeg, giflib
@@ -83,7 +83,7 @@ let
outputs = [ "out" "jre" ];
nativeBuildInputs = [ pkgconfig lndir ];
nativeBuildInputs = [ pkg-config lndir ];
buildInputs = [
cpio file which unzip zip perl openjdk8-bootstrap zlib cups freetype alsaLib
libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
pkgs/development/compilers/openjdk/openjfx/11.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, writeText, gradleGen, pkgconfig, perl, cmake
{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib, ffmpeg_3, python, ruby
, openjdk11-bootstrap }:
@@ -20,7 +20,7 @@ let
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
dontUseCmakeConfigure = true;
pkgs/development/compilers/openjdk/openjfx/15.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
, pkgconfig, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsaLib
, ffmpeg_3, python, ruby }:
let
@@ -22,7 +22,7 @@ let
};
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsaLib ffmpeg_3 ];
nativeBuildInputs = [ gradle_ perl pkgconfig cmake gperf python ruby ];
nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python ruby ];
dontUseCmakeConfigure = true;
pkgs/development/compilers/rust/cargo.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, file, curl, pkgconfig, python3, openssl, cmake, zlib
{ stdenv, file, curl, pkg-config, python3, openssl, cmake, zlib
, installShellFiles, makeWrapper, libiconv, cacert, rustPlatform, rustc
, CoreFoundation, Security
}:
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
# changes hash of vendor directory otherwise
dontUpdateAutotoolsGnuConfigScripts = true;
nativeBuildInputs = [ pkgconfig cmake installShellFiles makeWrapper ];
nativeBuildInputs = [ pkg-config cmake installShellFiles makeWrapper ];
buildInputs = [ cacert file curl python3 openssl zlib ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
pkgs/development/compilers/rust/rls/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, makeWrapper, fetchFromGitHub, rustPlatform
, openssh, openssl, pkgconfig, cmake, zlib, curl, libiconv
, openssh, openssl, pkg-config, cmake, zlib, curl, libiconv
, CoreFoundation, Security }:
rustPlatform.buildRustPackage {
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
# rls-rustc links to rustc_private crates
CARGO_BUILD_RUSTFLAGS = if stdenv.isDarwin then "-C rpath" else null;
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ openssh openssl curl zlib libiconv makeWrapper rustPlatform.rust.rustc.llvm ]
++ (stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security ]);
pkgs/development/compilers/rust/rustc.nix
+2 -2
View File
@@ -2,7 +2,7 @@
, llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget
, fetchurl, file, python3
, darwin, cmake, rust, rustPlatform
, pkgconfig, openssl
, pkg-config, openssl
, which, libffi
, withBundledLLVM ? false
, enableRustcDev ? true
@@ -133,7 +133,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [
file python3 rustPlatform.rust.rustc cmake
which libffi removeReferencesTo pkgconfig
which libffi removeReferencesTo pkg-config
];
buildInputs = [ openssl ]
pkgs/development/compilers/sagittarius-scheme/default.nix
+2 -2
View File
@@ -1,7 +1,7 @@
{ stdenv
, fetchurl
, cmake
, pkgconfig
, pkg-config
, libffi
, boehmgc
, openssl
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
# build extensions
export ${platformLdLibraryPath}="$(pwd)/build"
'';
nativeBuildInputs = [ pkgconfig cmake ];
nativeBuildInputs = [ pkg-config cmake ];
buildInputs = [ libffi boehmgc openssl zlib ] ++ stdenv.lib.optional odbcSupport libiodbc;
pkgs/development/compilers/squeak/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
, libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
, libpthreadstubs, pango, pkg-config, libpulseaudio, which }:
stdenv.mkDerivation rec {
pname = "squeak";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
pango libpulseaudio which ];
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
postPatch = ''
for i in squeak.in squeak.sh.in; do
pkgs/development/compilers/swi-prolog/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, jdk, gmp, readline, openssl, unixODBC, zlib
, libarchive, db, pcre, libedit, libossp_uuid, libXpm
, libSM, libXt, freetype, pkgconfig, fontconfig
, libSM, libXt, freetype, pkg-config, fontconfig
, cmake, libyaml, Security
, libjpeg, libX11, libXext, libXft, libXinerama
, extraLibraries ? [ jdk unixODBC libXpm libSM libXt freetype fontconfig ]
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
fetchSubmodules = true;
};
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ gmp readline openssl
libarchive libyaml db pcre libedit libossp_uuid
pkgs/development/compilers/swift/default.nix
+3 -3
View File
@@ -7,7 +7,7 @@
, perl
, libedit
, ninja
, pkgconfig
, pkg-config
, sqlite
, swig
, bash
@@ -141,7 +141,7 @@ stdenv.mkDerivation {
makeWrapper
ninja
perl
pkgconfig
pkg-config
python
rsync
which
@@ -155,7 +155,7 @@ stdenv.mkDerivation {
libgit2
python
];
propagatedUserEnvPkgs = [ git pkgconfig ];
propagatedUserEnvPkgs = [ git pkg-config ];
hardeningDisable = [ "format" ]; # for LLDB
pkgs/development/compilers/vala/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, flex, bison, libxslt, autoconf, autoreconfHook
{ stdenv, lib, fetchurl, fetchpatch, pkg-config, flex, bison, libxslt, autoconf, autoreconfHook
, graphviz, glib, libiconv, libintl, libtool, expat, substituteAll
}:
@@ -70,7 +70,7 @@ let
outputs = [ "out" "devdoc" ];
nativeBuildInputs = [
pkgconfig flex bison libxslt
pkg-config flex bison libxslt
] ++ lib.optional (stdenv.isDarwin && (lib.versionAtLeast version "0.38")) expat
++ lib.optional disableGraphviz autoreconfHook # if we changed our ./configure script, need to reconfigure
++ extraNativeBuildInputs;