tasiaiso/tildefriends
1
0
Fork 0
forked from cory/tildefriends
Code Issues Pull Requests Releases Wiki Activity

build: Let's go back to nix trying to use its own OpenSSL.

Browse Source
This commit is contained in:
Cory McWilliams 2025-01-30 12:31:12 -05:00
parent 697e2f2071
commit 8d529327a4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GNUmakefile
View File

@ -35,6 +35,7 @@ BUNDLETOOL = out/bundletool.jar
HAVE_WIN := 0 HAVE_WIN := 0
HAVE_CROSS_AARCH64 := 0 HAVE_CROSS_AARCH64 := 0
USE_SYSTEM_SSL := 0
export SOURCE_DATE_EPOCH=1 export SOURCE_DATE_EPOCH=1
export TZ=UTC export TZ=UTC
@ -1144,7 +1145,7 @@ ifeq ($(UNAME_S),Linux)
LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
$(LOCAL_DEPS): $(LOCAL_DEPS):
+@/usr/bin/env bash tools/ssl-local +@/usr/bin/env bash tools/ssl-local
$(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): | $(LOCAL_DEPS) $(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): $(if $(USE_SYSTEM_SSL), , | $(LOCAL_DEPS))
ifeq ($(HAVE_CROSS_AARCH64),1) ifeq ($(HAVE_CROSS_AARCH64),1)
LOCAL_DEPS := deps/openssl/$(UNAME_S)/aarch64/usr/local/lib/libssl.a LOCAL_DEPS := deps/openssl/$(UNAME_S)/aarch64/usr/local/lib/libssl.a

5
default.nix
View File

@ -33,19 +33,20 @@ pkgs.stdenv.mkDerivation rec {
}; };
nativeBuildInputs = with pkgs; [ nativeBuildInputs = with pkgs; [
bash
glibc glibc
gnumake gnumake
openssl
which which
]; ];
buildInputs = with pkgs; [ buildInputs = with pkgs; [
glibc glibc
openssl
which which
]; ];
buildPhase = '' buildPhase = ''
make -j $NIX_BUILD_CORES release make -j $NIX_BUILD_CORES release USE_SYSTEM_SSL=1
''; '';
installPhase = '' installPhase = ''