From 63f0b0bec912871399a91de39c5ce83edd3f863e Mon Sep 17 00:00:00 2001 From: Andrey Rudenko Date: Mon, 29 Apr 2024 18:57:47 +0200 Subject: [PATCH] explicit DISABLE_HOMEBREW --- Makefile | 3 +-- flake.nix | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f8dc4ffcf2..5e2b3c4367 100644 --- a/Makefile +++ b/Makefile @@ -25,8 +25,7 @@ ifeq ($(UNAME_S),Linux) # Seccomp BPF is only available for Linux PG_CONFIGURE_OPTS += --with-libseccomp else ifeq ($(UNAME_S),Darwin) - BREW_INSTALLED := $(shell command -v brew >/dev/null 2>&1 && echo yes || echo no) - ifeq ($(BREW_INSTALLED),yes) + ifndef DISABLE_HOMEBREW # macOS with brew-installed openssl requires explicit paths # It can be configured with OPENSSL_PREFIX variable OPENSSL_PREFIX ?= $(shell brew --prefix openssl@3) diff --git a/flake.nix b/flake.nix index 0aa3e8dbef..a8814c746e 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,8 @@ curl ]; + env.DISABLE_HOMEBREW = "1"; + scripts = { neonmake = { description = "Build Neon";