Skip to content

Commit 589dfe9

Browse files
committed
replace operator specific imports with BINDGEN_EXTRA_CLANG_ARGS
1 parent a9d410b commit 589dfe9

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

template/shell.nix.j2

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,10 @@ in pkgs.mkShell rec {
2020
];
2121

2222
# derivation runtime dependencies
23-
buildInputs = pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet ++ [ pkgs.libz ];
23+
buildInputs = pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet;
2424

2525
# build time dependencies
2626
nativeBuildInputs = pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
27-
# specific to secret-operator but should be discovered via crate2nix, but
28-
# otherwise, we could include an operator-specific nix import for any extras
29-
pkg-config
30-
clang
31-
openssl
32-
protobuf
33-
krb5
34-
3527
git
3628
yq-go
3729
jq
@@ -49,4 +41,5 @@ in pkgs.mkShell rec {
4941
]);
5042

5143
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
44+
BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang}/resource-root/include";
5245
}

0 commit comments

Comments
 (0)