status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: on macOS download openssl@1.1 bottle because openssl bottle is now alias for openssl@3

This commit is contained in:
Michael Bradley, Jr 2021-09-24 11:12:47 -05:00 committed by Michael Bradley
parent 633526abfa
commit d969766e67
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -102,7 +102,7 @@ endif
ifeq ($(detected_OS),Darwin) ifeq ($(detected_OS),Darwin)
BOTTLES_DIR := $(shell pwd)/bottles BOTTLES_DIR := $(shell pwd)/bottles
BOTTLES := $(addprefix $(BOTTLES_DIR)/,hunspell openssl pcre) BOTTLES := $(addprefix $(BOTTLES_DIR)/,hunspell openssl@1.1 pcre)
$(BOTTLES): | $(BOTTLES_DIR) $(BOTTLES): | $(BOTTLES_DIR)
echo -e "\e[92mFetching:\e[39m $(notdir $@) bottle" echo -e "\e[92mFetching:\e[39m $(notdir $@) bottle"

5
config.nims
View File

@ -17,8 +17,8 @@ if defined(macosx):
switch("passL", "-rpath" & " " & getEnv("QT5_LIBDIR")) switch("passL", "-rpath" & " " & getEnv("QT5_LIBDIR"))
switch("passL", "-rpath" & " " & getEnv("STATUSGO_LIBDIR")) switch("passL", "-rpath" & " " & getEnv("STATUSGO_LIBDIR"))
# statically link these libs # statically link these libs
switch("passL", "bottles/openssl/lib/libcrypto.a") switch("passL", "bottles/openssl@1.1/lib/libcrypto.a")
switch("passL", "bottles/openssl/lib/libssl.a") switch("passL", "bottles/openssl@1.1/lib/libssl.a")
switch("passL", "bottles/pcre/lib/libpcre.a") switch("passL", "bottles/pcre/lib/libpcre.a")
# https://code.videolan.org/videolan/VLCKit/-/issues/232 # https://code.videolan.org/videolan/VLCKit/-/issues/232
switch("passL", "-Wl,-no_compact_unwind") switch("passL", "-Wl,-no_compact_unwind")
@ -44,4 +44,3 @@ switch("warning", "ObservableStores:off")
# Too many false positives for "Warning: method has lock level <unknown>, but another method has 0 [LockLevel]" # Too many false positives for "Warning: method has lock level <unknown>, but another method has 0 [LockLevel]"
switch("warning", "LockLevel:off") switch("warning", "LockLevel:off")