2 Commits

Author SHA1 Message Date
8d529327a4 build: Let's go back to nix trying to use its own OpenSSL.
All checks were successful
Build Tilde Friends / Build-All (push) Successful in 19m34s
2025-01-30 12:31:12 -05:00
697e2f2071 build: Nope, I don't understand nix.
Some checks failed
Build Tilde Friends / Build-All (push) Failing after 1m40s
2025-01-29 20:53:09 -05:00
3 changed files with 5 additions and 5 deletions

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
@ -1143,8 +1144,8 @@ $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)
ifeq ($(UNAME_S),Linux) 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):
+@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

View File

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

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#
BUILD_PLATFORM=$(uname -s) BUILD_PLATFORM=$(uname -s)
if [[ -z $BUILD_TARGET ]]; then if [[ -z $BUILD_TARGET ]]; then
BUILD_TARGET=$(uname -m) BUILD_TARGET=$(uname -m)