git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108782 from erictapen/sequoia-crate-overrides
commit04065a73547d3c93a25225531ee1e9d9642ff761 authorJörg Thalheim <Mic92@users.noreply.github.com> dateSat 9 Jan 2021, 10:41 (6 years ago) parentce9a7359038cc6
1 file changed+53−12
pkgs/build-support/rust/default-crate-overrides.nix+53−12
pkgs/build-support/rust/default-crate-overrides.nix+53−12
@@ -1,6 +1,7 @@
1−{ stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
1+{ stdenv, pkg-config, curl, darwin, libiconv, libgit2, libssh2,
22 openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3,
3− libsodium, postgresql, gmp, foundationdb, ... }:
3+ libsodium, postgresql, gmp, foundationdb, capnproto, nettle, clang,
4+ llvmPackages, ... }:
45
56let
67 inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
@@ -10,26 +11,30 @@ in
1011 buildInputs = [ cairo ];
1112 };
1213
14+ capnp-rpc = attrs: {
15+ nativeBuildInputs = [ capnproto ];
16+ };
17+
1318 cargo = attrs: {
1419 buildInputs = [ openssl zlib curl ]
1520 ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv ];
1621 };
1722
1823 libz-sys = attrs: {
19− nativeBuildInputs = [ pkgconfig ];
24+ nativeBuildInputs = [ pkg-config ];
2025 buildInputs = [ zlib ];
2126 extraLinkFlags = ["-L${zlib.out}/lib"];
2227 };
2328
2429 curl-sys = attrs: {
25− nativeBuildInputs = [ pkgconfig ];
30+ nativeBuildInputs = [ pkg-config ];
2631 buildInputs = [ zlib curl ];
2732 propagatedBuildInputs = [ curl zlib ];
2833 extraLinkFlags = ["-L${zlib.out}/lib"];
2934 };
3035
3136 dbus = attrs: {
32− nativeBuildInputs = [ pkgconfig ];
37+ nativeBuildInputs = [ pkg-config ];
3338 buildInputs = [ dbus ];
3439 };
3540
@@ -65,36 +70,42 @@ in
6570
6671 libgit2-sys = attrs: {
6772 LIBGIT2_SYS_USE_PKG_CONFIG = true;
68− nativeBuildInputs = [ pkgconfig ];
73+ nativeBuildInputs = [ pkg-config ];
6974 buildInputs = [ openssl zlib libgit2 ];
7075 };
7176
7277 libsqlite3-sys = attrs: {
73− nativeBuildInputs = [ pkgconfig ];
78+ nativeBuildInputs = [ pkg-config ];
7479 buildInputs = [ sqlite ];
7580 };
7681
7782 libssh2-sys = attrs: {
78− nativeBuildInputs = [ pkgconfig ];
83+ nativeBuildInputs = [ pkg-config ];
7984 buildInputs = [ openssl zlib libssh2 ];
8085 };
8186
8287 libdbus-sys = attrs: {
83− nativeBuildInputs = [ pkgconfig ];
88+ nativeBuildInputs = [ pkg-config ];
8489 buildInputs = [ dbus ];
8590 };
8691
92+ nettle-sys = attrs: {
93+ nativeBuildInputs = [ pkg-config ];
94+ buildInputs = [ nettle clang ];
95+ LIBCLANG_PATH = "${llvmPackages.libclang}/lib";
96+ };
97+
8798 openssl = attrs: {
8899 buildInputs = [ openssl ];
89100 };
90101
91102 openssl-sys = attrs: {
92− nativeBuildInputs = [ pkgconfig ];
103+ nativeBuildInputs = [ pkg-config ];
93104 buildInputs = [ openssl ];
94105 };
95106
96107 pq-sys = attr: {
97− nativeBuildInputs = [ pkgconfig ];
108+ nativeBuildInputs = [ pkg-config ];
98109 buildInputs = [ postgresql ];
99110 };
100111
@@ -107,12 +118,42 @@ in
107118 propagatedBuildInputs = [ Security ];
108119 };
109120
121+ sequoia-openpgp = attrs: {
122+ buildInputs = [ gmp ];
123+ };
124+
125+ sequoia-openpgp-ffi = attrs: {
126+ buildInputs = [ gmp ];
127+ };
128+
129+ sequoia-ipc = attrs: {
130+ buildInputs = [ gmp ];
131+ };
132+
133+ sequoia-guide = attrs: {
134+ buildInputs = [ gmp ];
135+ };
136+
137+ sequoia-store = attrs: {
138+ nativeBuildInputs = [ capnproto ];
139+ buildInputs = [ sqlite gmp ];
140+ };
141+
142+ sequoia-sq = attrs: {
143+ buildInputs = [ sqlite gmp ];
144+ };
145+
146+ sequoia-tool = attrs: {
147+ nativeBuildInputs = [ capnproto ];
148+ buildInputs = [ sqlite gmp ];
149+ };
150+
110151 serde_derive = attrs: {
111152 buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
112153 };
113154
114155 thrussh-libsodium = attrs: {
115− nativeBuildInputs = [ pkgconfig ];
156+ nativeBuildInputs = [ pkg-config ];
116157 buildInputs = [ libsodium ];
117158 };
118159