From 0d9f4fae4fe528cd23496e9803d90fd879000355 Mon Sep 17 00:00:00 2001 From: "Klaus T. Aehlig" Date: Wed, 12 Feb 2025 14:17:39 +0100 Subject: Update nix dependencies --- nix-dependencies/dependencies.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nix-dependencies') 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)) \ -- cgit v1.2.3