From 9fa223eaaf0eda4e5f76621dc6d457417afb8b54 Mon Sep 17 00:00:00 2001 From: Remo Senekowitsch Date: Wed, 12 Jun 2024 17:45:38 +0200 Subject: chore(build): compile protobufs with protox (#2122) * chore(build): compile protobufs with protox protox is a pure-rust implementation of the protobuf compiler. Therefore, it can be managed by cargo. This removes the implicit dependency on protoc being available in the environment for the build. * fix(build): replace copypasta in build script The paths passed to `compile` aren't actually used by the build. `skip_protoc_run` prevents that. That's why a clean build succeeds even with this mistake. However, the paths are passed to a `cargo:rerun-if-changed` directive. So this mistake would've caused a failed incremental build if the protobuf definitions were changed. --- atuin.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'atuin.nix') diff --git a/atuin.nix b/atuin.nix index 43450b8e..c02a82de 100644 --- a/atuin.nix +++ b/atuin.nix @@ -13,7 +13,6 @@ Security, SystemConfiguration, AppKit, - protobuf, }: rustPlatform.buildRustPackage { name = "atuin"; @@ -28,9 +27,7 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [installShellFiles]; - buildInputs = lib.optionals stdenv.isDarwin [libiconv Security SystemConfiguration AppKit protobuf]; - - env.PROTOC = lib.getExe' protobuf "protoc"; + buildInputs = lib.optionals stdenv.isDarwin [libiconv Security SystemConfiguration AppKit]; postInstall = '' installShellCompletion --cmd atuin \ -- cgit v1.3.1