mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-10 02:52:55 +00:00
fix: build terraform on darwin w broken tests
This commit is contained in:
parent
5d2d26b3d9
commit
ab4e516ba8
@ -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,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
12
overlays/terraform.nix
Normal 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)))
|
||||||
|
];
|
||||||
|
});
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user