diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2025-02-12 14:34:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-12 14:34:57 +0100 |
| commit | e5d4cd2160d122471de483b882aaad511414c26c (patch) | |
| tree | 2de8aa38d0654788f224f8a1e248fce1085fa2da /nix-dependencies | |
| parent | 1d998983b4ff8c309f2b50b991a36cee151f012e (diff) | |
| parent | 0d9f4fae4fe528cd23496e9803d90fd879000355 (diff) | |
| download | hello-nix-e5d4cd2160d122471de483b882aaad511414c26c.tar.gz | |
Merge pull request #7 from aehlig/update-2025-02-10
Update dependencies
Diffstat (limited to 'nix-dependencies')
| -rw-r--r-- | nix-dependencies/dependencies.nix | 10 |
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)) \ |