summaryrefslogtreecommitdiff
path: root/nix-dependencies/dependencies.nix
diff options
context:
space:
mode:
authorKlaus T. Aehlig <aehlig@linta.de>2025-02-12 14:17:39 +0100
committerKlaus T. Aehlig <aehlig@linta.de>2025-02-12 14:17:39 +0100
commit0d9f4fae4fe528cd23496e9803d90fd879000355 (patch)
tree2de8aa38d0654788f224f8a1e248fce1085fa2da /nix-dependencies/dependencies.nix
parentf1bd58b41da21c41a4f24f9aba5a4b39b75468fe (diff)
downloadhello-nix-0d9f4fae4fe528cd23496e9803d90fd879000355.tar.gz
Update nix dependencies
Diffstat (limited to 'nix-dependencies/dependencies.nix')
-rw-r--r--nix-dependencies/dependencies.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/nix-dependencies/dependencies.nix b/nix-dependencies/dependencies.nix
index cce0911..7205417 100644
--- a/nix-dependencies/dependencies.nix
+++ b/nix-dependencies/dependencies.nix
@@ -3,7 +3,7 @@
, bash
, pkg-config
, coreutils
-, protobuf_25
+, protobuf
, grpc
, clang
, fmt
@@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
pkg-config
- protobuf_25
- grpc
jo
bash
];
@@ -35,14 +33,16 @@ stdenv.mkDerivation rec {
coreutils
gnugrep
unixtools.xxd
+ protobuf
+ grpc
];
buildPhase = ''
echo PKG_CONFIG_PATH=$PKG_CONFIG_PATH
jo TOOLCHAIN_CONFIG=$(jo \
CC=$(jo PATH=$(jo -a ${clang}/bin ${coreutils}/bin ${busybox}/bin)) \
- PROTO=$(jo PATH=$(jo -a ${protobuf_25}/bin ${grpc}/bin) \
- PROTOC=${protobuf_25}/bin/protoc \
+ PROTO=$(jo PATH=$(jo -a ${protobuf}/bin ${grpc}/bin) \
+ PROTOC=${protobuf}/bin/protoc \
GRPC_PLUGIN=${grpc}/bin/grpc_cpp_plugin \
) \
shell=$(jo PATH=$(jo -a ${coreutils}/bin)) \