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

defaultCrateOverrides: pkgconfig -> pkg-config

Browse Source
This commit is contained in:
Justin Humm 2021-01-08 17:26:05 +01:00
parent c7e546aea1
commit 9df8a98fac
No known key found for this signature in database
GPG Key ID: 5F24E3BD56617EB2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/build-support/rust/default-crate-overrides.nix
View File

@ -1,4 +1,4 @@
{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2, { stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2,
openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3, openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3,
libsodium, postgresql, gmp, foundationdb, ... }: libsodium, postgresql, gmp, foundationdb, ... }:
@ -16,20 +16,20 @@ in
}; };
libz-sys = attrs: { libz-sys = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib ]; buildInputs = [ zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"]; extraLinkFlags = ["-L${zlib.out}/lib"];
}; };
curl-sys = attrs: { curl-sys = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib curl ]; buildInputs = [ zlib curl ];
propagatedBuildInputs = [ curl zlib ]; propagatedBuildInputs = [ curl zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"]; extraLinkFlags = ["-L${zlib.out}/lib"];
}; };
dbus = attrs: { dbus = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ]; buildInputs = [ dbus ];
}; };
@ -65,22 +65,22 @@ in
libgit2-sys = attrs: { libgit2-sys = attrs: {
LIBGIT2_SYS_USE_PKG_CONFIG = true; LIBGIT2_SYS_USE_PKG_CONFIG = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl zlib libgit2 ]; buildInputs = [ openssl zlib libgit2 ];
}; };
libsqlite3-sys = attrs: { libsqlite3-sys = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ sqlite ]; buildInputs = [ sqlite ];
}; };
libssh2-sys = attrs: { libssh2-sys = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl zlib libssh2 ]; buildInputs = [ openssl zlib libssh2 ];
}; };
libdbus-sys = attrs: { libdbus-sys = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ]; buildInputs = [ dbus ];
}; };
@ -89,12 +89,12 @@ in
}; };
openssl-sys = attrs: { openssl-sys = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ]; buildInputs = [ openssl ];
}; };
pq-sys = attr: { pq-sys = attr: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ postgresql ]; buildInputs = [ postgresql ];
}; };
@ -112,7 +112,7 @@ in
}; };
thrussh-libsodium = attrs: { thrussh-libsodium = attrs: {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ libsodium ]; buildInputs = [ libsodium ];
}; };