diff options
| author | Remo Senekowitsch <remo@buenzli.dev> | 2024-06-12 17:45:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 16:45:38 +0100 |
| commit | 9fa223eaaf0eda4e5f76621dc6d457417afb8b54 (patch) | |
| tree | 8327137d550f5aacdd6c05bc89eed3afca3387dd /atuin.nix | |
| parent | chore: remove unnecessary proto import (#2120) (diff) | |
| download | atuin-9fa223eaaf0eda4e5f76621dc6d457417afb8b54.zip | |
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.
Diffstat (limited to '')
| -rw-r--r-- | atuin.nix | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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 \ |
