noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-22 20:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: build terraform on darwin w broken tests

Browse Source
This commit is contained in:
Noah Masur 2024-01-02 16:35:09 -05:00
parent 5d2d26b3d9
commit ab4e516ba8
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -245,6 +245,7 @@
(import ./overlays/proton-ge.nix inputs) (import ./overlays/proton-ge.nix inputs)
(import ./overlays/gh-collaborators.nix) (import ./overlays/gh-collaborators.nix)
(import ./overlays/bypass-paywalls-clean.nix inputs) (import ./overlays/bypass-paywalls-clean.nix inputs)
(import ./overlays/terraform.nix)
]; ];
# System types to support. # System types to support.

2
modules/darwin/utilities.nix
View File

@ -2,6 +2,8 @@
{ {
unfreePackages = [ "consul" "vault-bin" ];
home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin { home-manager.users.${config.user} = lib.mkIf pkgs.stdenv.isDarwin {
home.packages = with pkgs; [ home.packages = with pkgs; [

12
overlays/terraform.nix Normal file
View File

@ -0,0 +1,12 @@
# Fix for Terraform and Consul on Darwin:
# https://github.com/NixOS/nixpkgs/pull/275534/files
_final: prev: {
girara = prev.girara.overrideAttrs (old: {
mesonFlags = [
"-Ddocs=disabled"
(prev.lib.mesonEnable "tests"
((prev.stdenv.buildPlatform.canExecute prev.stdenv.hostPlatform)
&& (!prev.stdenv.isDarwin)))
];
});
}