summaryrefslogtreecommitdiffstats
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorJustin Humm <justin.humm@posteo.de>2021-01-08 17:26:05 +0100
committerJustin Humm <justin.humm@posteo.de>2021-01-08 17:26:05 +0100
commit9df8a98fac7f5dd360bf1fb47bc8b9ad27852f8c (patch)
tree55b50d0111e74a8d559a6c09516bf442d082c288 /pkgs/build-support
parentc7e546aea1b1fd23fe6acbbeee293f312a98c3be (diff)
defaultCrateOverrides: pkgconfig -> pkg-config
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/rust/default-crate-overrides.nix22
1 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index d0e69ad698a8..5365b15d8c6e 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -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,
libsodium, postgresql, gmp, foundationdb, ... }:
@@ -16,20 +16,20 @@ in
};
libz-sys = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
};
curl-sys = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib curl ];
propagatedBuildInputs = [ curl zlib ];
extraLinkFlags = ["-L${zlib.out}/lib"];
};
dbus = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ];
};
@@ -65,22 +65,22 @@ in
libgit2-sys = attrs: {
LIBGIT2_SYS_USE_PKG_CONFIG = true;
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl zlib libgit2 ];
};
libsqlite3-sys = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ sqlite ];
};
libssh2-sys = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl zlib libssh2 ];
};
libdbus-sys = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ dbus ];
};
@@ -89,12 +89,12 @@ in
};
openssl-sys = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl ];
};
pq-sys = attr: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ postgresql ];
};
@@ -112,7 +112,7 @@ in
};
thrussh-libsodium = attrs: {
- nativeBuildInputs = [ pkgconfig ];
+ nativeBuildInputs = [ pkg-config ];
buildInputs = [ libsodium ];
};