Skip to content

fix(nix): use host platform for system dependencies #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Eotel wants to merge 1 commit into from
Closed

fix(nix): use host platform for system dependencies #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/nix-host-platform.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@googleworkspace/cli": patch
---

Use Nix host platform attributes when selecting system dependencies.
4 changes: 2 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
};

nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux linuxDeps
++ pkgs.lib.optionals pkgs.stdenv.isDarwin darwinDeps;
buildInputs = pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux linuxDeps
++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isDarwin darwinDeps;

# Tests are disabled by default in buildRustPackage if not specified,
# but we'll be explicit. Some tests might require network.
Expand Down
Loading